From ed027a53553d4935d9a65c434de7cb6bd963419c Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 2 Sep 2003 22:42:05 +0000 Subject: 2003-09-02 Thomas Pfaff * libc/stdlib/atexit.c: Rename _REENT to _GLOBAL_REENT throughout. * libc/stdlib/exit.c : Ditto. * libc/stdlib/on_exit.c: Ditto. --- newlib/ChangeLog | 6 ++++++ newlib/libc/stdlib/atexit.c | 10 +++++----- newlib/libc/stdlib/exit.c | 6 +++--- newlib/libc/stdlib/on_exit.c | 10 +++++----- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index bed5f41..485dd23 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,9 @@ +2003-09-02 Thomas Pfaff + + * libc/stdlib/atexit.c: Rename _REENT to _GLOBAL_REENT throughout. + * libc/stdlib/exit.c : Ditto. + * libc/stdlib/on_exit.c: Ditto. + 2003-08-27 Corinna Vinschen * libc/include/reent.h: Define stat64 as __stat64 when diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c index e0e4298..97424da 100644 --- a/newlib/libc/stdlib/atexit.c +++ b/newlib/libc/stdlib/atexit.c @@ -67,19 +67,19 @@ _DEFUN (atexit, /* _REENT_SMALL atexit() doesn't allow more than the required 32 entries. */ #ifndef _REENT_SMALL - if ((p = _REENT->_atexit) == NULL) - _REENT->_atexit = p = &_REENT->_atexit0; + if ((p = _GLOBAL_REENT->_atexit) == NULL) + _GLOBAL_REENT->_atexit = p = &_GLOBAL_REENT->_atexit0; if (p->_ind >= _ATEXIT_SIZE) { if ((p = (struct _atexit *) malloc (sizeof *p)) == NULL) return -1; p->_ind = 0; p->_on_exit_args._fntypes = 0; - p->_next = _REENT->_atexit; - _REENT->_atexit = p; + p->_next = _GLOBAL_REENT->_atexit; + _GLOBAL_REENT->_atexit = p; } #else - p = &_REENT->_atexit; + p = &_GLOBAL_REENT->_atexit; if (p->_ind >= _ATEXIT_SIZE) return -1; #endif diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c index a659361..286c20d 100644 --- a/newlib/libc/stdlib/exit.c +++ b/newlib/libc/stdlib/exit.c @@ -64,7 +64,7 @@ _DEFUN (exit, (code), register int n; int i; - p = &_REENT->_atexit; + p = &_GLOBAL_REENT->_atexit; #ifdef _REENT_SMALL args = p->_on_exit_args_ptr; @@ -98,8 +98,8 @@ _DEFUN (exit, (code), while (p); #endif - if (_REENT->__cleanup) - (*_REENT->__cleanup) (_REENT); + if (_GLOBAL_REENT->__cleanup) + (*_GLOBAL_REENT->__cleanup) (_GLOBAL_REENT); _exit (code); } diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c index b7bf6f3..f338350 100644 --- a/newlib/libc/stdlib/on_exit.c +++ b/newlib/libc/stdlib/on_exit.c @@ -74,7 +74,7 @@ _DEFUN (on_exit, /* _REENT_SMALL on_exit() doesn't allow more than the required 32 entries. */ #ifdef _REENT_SMALL - p = &_REENT->_atexit; + p = &_GLOBAL_REENT->_atexit; if (p->_ind >= _ATEXIT_SIZE) return -1; args = p->_on_exit_args_ptr; @@ -87,16 +87,16 @@ _DEFUN (on_exit, p->_on_exit_args_ptr = args; } #else - if ((p = _REENT->_atexit) == NULL) - _REENT->_atexit = p = &_REENT->_atexit0; + if ((p = _GLOBAL_REENT->_atexit) == NULL) + _GLOBAL_REENT->_atexit = p = &_GLOBAL_REENT->_atexit0; if (p->_ind >= _ATEXIT_SIZE) { if ((p = (struct _atexit *) malloc (sizeof *p)) == NULL) return -1; p->_ind = 0; p->_on_exit_args._fntypes = 0; - p->_next = _REENT->_atexit; - _REENT->_atexit = p; + p->_next = _GLOBAL_REENT->_atexit; + _GLOBAL_REENT->_atexit = p; } args = & p->_on_exit_args; #endif -- cgit v1.1