Author: paullanders Date: Wed Oct 19 01:06:40 2016 New Revision: 40161 URL: http://svn.gna.org/viewcvs/gnustep?rev=40161&view=rev Log: fix types for builtin setjmp
Modified: libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSException.h Modified: libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSException.h URL: http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSException.h?rev=40161&r1=40160&r2=40161&view=diff ============================================================================== --- libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSException.h (original) +++ libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSException.h Wed Oct 19 01:06:40 2016 @@ -58,11 +58,13 @@ /* This hack is to deal with the fact that currently (June 2016) the * implementation of longjmp in mingw-w64 sometimes crashes in msvcrt.dll * but the builtin version provided by gcc seems to work. - */ + */ #ifdef setjmp #undef setjmp #endif +// Testplant: also changed declaration of jmp_buf below to line up with the builtins #define setjmp(X) __builtin_setjmp(X) + #ifdef longjmp #undef longjmp #endif @@ -284,7 +286,11 @@ */ typedef struct _NSHandler { +#ifdef __MINGW64__ // other half of hack to use builtins + void *jumpState[20]; +#else jmp_buf jumpState; /* place to longjmp to */ +#endif struct _NSHandler *next; /* ptr to next handler */ __unsafe_unretained NSException *exception; } NSHandler; _______________________________________________ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs