diff options
Diffstat (limited to 'winsup/cygwin/include')
| -rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 11 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/cygwin.h | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index fb9ce136b..08ffebcf2 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -62,8 +62,11 @@ details. */ /* Every version of cygwin <= this uses an old, incorrect method to determine signal masks. */ +#define CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED(u) \ + CYGWIN_VERSION_DLL_MAKE_COMBINED ((u)->api_major, (u)->api_minor) + #define CYGWIN_VERSION_USER_API_VERSION_COMBINED \ - CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) + CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (user_data) /* API versions <= this had a termios structure whose members were too small to accomodate modern settings. */ @@ -98,6 +101,9 @@ details. */ #define CYGWIN_VERSION_CHECK_FOR_OLD_CTYPE \ (CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 209) +#define CYGWIN_VERSION_USE_PSEUDO_RELOC_IN_DLL(u) \ + (CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (u) >= 227) + #define CYGWIN_VERSION_CYGWIN_CONV 181 /* API_MAJOR 0.0: Initial version. API_MINOR changes: @@ -380,12 +386,13 @@ details. */ 224: Export xdr* functions. 225: Export __xdr* functions. 226: Export __locale_mb_cur_max. + 227: Add pseudo_reloc_start, pseudo_reloc_end, image_base to per_process */ /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */ #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 226 +#define CYGWIN_VERSION_API_MINOR 227 /* There is also a compatibity version number associated with the shared memory regions. It is incremented when incompatible diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h index 425fd82fd..dcf61b081 100644 --- a/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h @@ -244,10 +244,6 @@ struct per_process /* For future expansion of values set by the app. */ void (*premain[4]) (int, char **, struct per_process *); - /* The rest are *internal* to cygwin.dll. - Those that are here because we want the child to inherit the value from - the parent (which happens when bss is copied) are marked as such. */ - /* non-zero of ctors have been run. Inherited from parent. */ int run_ctors_p; @@ -262,7 +258,10 @@ struct per_process DWORD api_minor; /* linked with */ /* For future expansion, so apps won't have to be relinked if we add an item. */ - DWORD unused2[6]; + DWORD unused2[3]; + void *pseudo_reloc_start; + void *pseudo_reloc_end; + void *image_base; #if defined (__INSIDE_CYGWIN__) && defined (__cplusplus) MTinterface *threadinterface; |