diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-01-27 02:34:46 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-01-27 02:34:46 +0000 |
| commit | d81e2928de6cefd3b3b8ad6420a0c30c23c1be2f (patch) | |
| tree | a8cd9e24d672698daa21dd31c91ce9b09ec53901 | |
| parent | 76e82d4c4926f1b4b1efdd43b7ce868547d06acd (diff) | |
| download | gdb-d81e2928de6cefd3b3b8ad6420a0c30c23c1be2f.tar.gz | |
* include/setjmp.h (_setjmp): Move from std to global
namespace.
| -rw-r--r-- | winsup/mingw/ChangeLog | 5 | ||||
| -rw-r--r-- | 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,5 +1,10 @@ 2003-01-27 Danny Smith <dannysmith@users.sourceforge.net> + * include/setjmp.h (_setjmp): Move from std to global + namespace. + +2003-01-27 Danny Smith <dannysmith@users.sourceforge.net> + Merge from mingw trunk (changes since 2002-12-10). 2003-01-26 Danny Smith <dannysmith@users.sourceforge.net> 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 */ |