JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* shared.cc (shared_info::initialize): Use correct value for version

Browse Source 
comparison.
* include/cygwin/version.h (CYGWIN_VERSION_MAGIC): Use all of a DWORD for magic
calculation.
This commit is contained in:
Christopher Faylor
2002-10-23 02:20:38 +00:00
parent 046a4e718e
commit 082512aea1
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,10 @@
2002-10-22 Christopher Faylor <cgf@redhat.com>
* shared.cc (shared_info::initialize): Use correct value for version
comparison.
* include/cygwin/version.h (CYGWIN_VERSION_MAGIC): Use all of a DWORD
for magic calculation.
2002-10-22 Christopher Faylor <cgf@redhat.com>
* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Oops. Only

2
winsup/cygwin/include/cygwin/version.h
View File

@@ -230,5 +230,5 @@ details. */
cygwin_internal (CW_GETVERSIONINFO).
*/
#define CYGWIN_VERSION_MAGIC(a, b) ((unsigned) (((unsigned short) a) | (unsigned short) b))
#define CYGWIN_VERSION_MAGIC(a, b) ((unsigned) ((((unsigned short) a) << 16) | (unsigned short) b))
#define CYGWIN_VERSION_MAGIC_VERSION(a) ((unsigned) ((unsigned)a & 0xffff))

2
winsup/cygwin/shared.cc
View File

@@ -149,7 +149,7 @@ shared_info::initialize ()
if (version)
{
if (version != SHARED_VERSION_MAGIC)
multiple_cygwin_problem ("shared", version, SHARED_VERSION);
multiple_cygwin_problem ("shared", version, SHARED_VERSION_MAGIC);
else if (cb != SHARED_INFO_CB)
multiple_cygwin_problem ("shared size", cb, SHARED_INFO_CB);
return;