From d81e2928de6cefd3b3b8ad6420a0c30c23c1be2f Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 27 Jan 2003 02:34:46 +0000 Subject: * include/setjmp.h (_setjmp): Move from std to global namespace. --- winsup/mingw/ChangeLog | 5 +++++ winsup/mingw/include/setjmp.h | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 541ede07961..cfbb0d4c53d 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2003-01-27 Danny Smith + + * include/setjmp.h (_setjmp): Move from std to global + namespace. + 2003-01-27 Danny Smith Merge from mingw trunk (changes since 2002-12-10). diff --git a/winsup/mingw/include/setjmp.h b/winsup/mingw/include/setjmp.h index 7d67a2e87c6..08de24dc03f 100644 --- a/winsup/mingw/include/setjmp.h +++ b/winsup/mingw/include/setjmp.h @@ -41,26 +41,27 @@ __BEGIN_CSTD_NAMESPACE * NOTE: This was determined on an i386 (actually a Pentium). The * contents could be different on an Alpha or something else. */ + #define _JBLEN 16 #define _JBTYPE int -typedef _JBTYPE jmp_buf[_JBLEN]; - -/* - * The function provided by CRTDLL which appears to do the actual work - * of setjmp. - */ -int _setjmp (jmp_buf); - -#define setjmp(x) _setjmp(x) +typedef _JBTYPE jmp_buf[_JBLEN]; /* * Return to the last setjmp call and act as if setjmp had returned * nVal (which had better be non-zero!). */ void longjmp (jmp_buf, int); - __END_CSTD_NAMESPACE +__BEGIN_CGLOBAL_NAMESPACE +/* + * The function provided by CRTDLL which appears to do the actual work + * of setjmp. + */ +int _setjmp (__CSTD jmp_buf); + +#define setjmp(x) _setjmp(x) +__END_CGLOBAL_NAMESPACE #endif /* Not RC_INVOKED */ -- cgit v1.2.1