diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-10-23 06:20:38 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-10-23 06:20:38 +0400 |
| commit | 082512aea1f22db6d4a7d5087d83de274c8d640c (patch) | |
| tree | 30e17f6825c0ad8e38ad745462523dc29b340feb | |
| parent | 046a4e718e824a9953922eedc4f32d8fac048f10 (diff) | |
* 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.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 2 | ||||
| -rw-r--r-- | winsup/cygwin/shared.cc | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 80623b3f1..8b11eeefb 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,12 @@ 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 do the executable thing for #! scripts since .exe files wouldn't be executable in ntsec case regardless. diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 373794430..f7284b606 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -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)) diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 8aaa3c655..78937da36 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -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; |