[newlib-cygwin] Cygwin: drop macro and code for CYGWIN_VERSION_DLL_EPOCH

Corinna Vinschen corinna@sourceware.org
Wed Aug 3 16:14:56 GMT 2022


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7ad791c1eec272eede58a938451ac1b755fc6e5b

commit 7ad791c1eec272eede58a938451ac1b755fc6e5b
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Aug 3 16:16:14 2022 +0200

    Cygwin: drop macro and code for CYGWIN_VERSION_DLL_EPOCH
    
    fix a comment in check_sanity_and_sync() on the way
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/dcrt0.cc                 | 9 +--------
 winsup/cygwin/include/cygwin/version.h | 4 ----
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 57694bcda..9162f84e7 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -374,14 +374,7 @@ check_sanity_and_sync (per_process *p)
   if (sizeof (per_process) != SIZEOF_PER_PROCESS)
     api_fatal ("per_process sanity check failed");
 
-  /* Make sure that the app and the dll are in sync. */
-
-  /* Complain if older than last incompatible change */
-  if (p->dll_major < CYGWIN_VERSION_DLL_EPOCH)
-    api_fatal ("cygwin DLL and APP are out of sync -- DLL version mismatch %u < %u",
-	       p->dll_major, CYGWIN_VERSION_DLL_EPOCH);
-
-  /* magic_biscuit != 0 if using the old style version numbering scheme.  */
+  /* magic_biscuit must be SIZEOF_PER_PROCESS.  */
   if (p->magic_biscuit != SIZEOF_PER_PROCESS)
     api_fatal ("Incompatible cygwin .dll -- incompatible per_process info %u != %u",
 	       p->magic_biscuit, SIZEOF_PER_PROCESS);
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index e5a861f8f..c190dc2d6 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -13,10 +13,6 @@ details. */
 #define CYGWIN_VERSION_DLL_MAJOR 3004
 #define CYGWIN_VERSION_DLL_MINOR 0
 
-/* Major numbers before CYGWIN_VERSION_DLL_EPOCH are incompatible. */
-
-#define CYGWIN_VERSION_DLL_EPOCH 19
-
 /* CYGWIN_VERSION_DLL_COMBINED gives us a single number representing the
    combined DLL major and minor numbers. */


More information about the Cygwin-cvs mailing list