From 35711de7537b27e92fcfc4eec223179b70b02afb Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 22 Jan 2004 19:14:07 +0000 Subject: [PATCH] * dcrt0.cc (reent_data): Make global. * cygwin.din: Reexport reent_data. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/cygwin.din | 1 + winsup/cygwin/dcrt0.cc | 2 +- winsup/cygwin/include/cygwin/version.h | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 07d199ffc..e5c57bd51 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2004-01-22 Christopher Faylor + + * dcrt0.cc (reent_data): Make global. + * cygwin.din: Reexport reent_data. + 2004-01-22 Christopher Faylor * cygtls.cc (_threadinfo::remove): Don't assume that we are removing diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din index 7d4c352d1..37023f9f4 100644 --- a/winsup/cygwin/cygwin.din +++ b/winsup/cygwin/cygwin.din @@ -24,6 +24,7 @@ opterr DATA optind DATA optopt DATA optreset DATA +reent_data DATA _alloca NOSIGFE dll_entry@12 NOSIGFE __assert SIGFE diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 96b712c17..37e52a996 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -93,7 +93,7 @@ extern "C" char ***main_environ; /* __progname used in getopt error message */ char *__progname; - static struct _reent reent_data; + struct _reent reent_data; struct per_process __cygwin_user_data = {/* initial_sp */ 0, /* magic_biscuit */ 0, /* dll_major */ CYGWIN_VERSION_DLL_MAJOR, diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index c341be8f5..484fed0b8 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -235,12 +235,13 @@ details. */ 108: Remove unused (hopefully) reent_data export. 109: Export clock_gettime, sigwaitinfo, timer_create, timer_delete, timer_settime + 110: Oh well. Someone uses reent_data. */ /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */ #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 109 +#define CYGWIN_VERSION_API_MINOR 110 /* There is also a compatibity version number associated with the shared memory regions. It is incremented when incompatible