diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2022-08-03 17:16:14 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2022-08-03 17:16:14 +0300 |
| commit | 7ad791c1eec272eede58a938451ac1b755fc6e5b (patch) | |
| tree | e4f1e7c0b1afa5ff9fdf52df78641057ced2b9e2 | |
| parent | c41f0e700a4865ed1bf23621e9c76343ae5f8587 (diff) | |
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>
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 9 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 4 |
2 files changed, 1 insertions, 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. */ |