diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-06-02 00:38:33 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-06-02 00:38:33 +0400 |
| commit | 748bc82966b89305ec3399ef99361c3b77a7c36d (patch) | |
| tree | 2d676363bbd03ee8394fe25411553cb3e297951a | |
| parent | 60abf1c4b875c2d7f82fd31579f351be3a619820 (diff) | |
* include/windef.h: Add no-op __try, __except, __finally
defines from ...
* include/excpt.h: Remove file.
* include/windows.h: Don't include excpt.h.
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/excpt.h | 20 | ||||
| -rw-r--r-- | winsup/w32api/include/windef.h | 13 | ||||
| -rw-r--r-- | winsup/w32api/include/windows.h | 1 |
4 files changed, 21 insertions, 21 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index ef0a3b3bf..74216e92f 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2002-06-01 Danny Smith <dannysmith@users.sourceforge.net> + + * include/windef.h: Add no-op __try, __except, __finally + defines from ... + * include/excpt.h: Remove file. + * include/windows.h: Don't include excpt.h. + 2002-05-30 Christopher January <chris@atomice.net> * include/ntdef.h (ANSI_STRING, PANSI_STRING, OEM_STRING, POEM_STRING): @@ -8,6 +15,7 @@ * include/w32api.h: Increment version to 1.5 * Makefile.in: Ditto. + 2002-05-27 René Møller Fonseca <fonseca@users.sourceforge.net> * include/winreg.h: (RegConnectRegistry[AW]): Replace diff --git a/winsup/w32api/include/excpt.h b/winsup/w32api/include/excpt.h deleted file mode 100644 index 774612458..000000000 --- a/winsup/w32api/include/excpt.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _EXCPT_H -#define _EXCPT_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -/* FIXME: This will make some code compile. The programs will most - likely crash when an exception is raised, but at least they will - compile. */ -#ifdef __GNUC__ -#define __try -#define __except(x) if (0) /* don't execute handler */ -#define __finally - -#define _try __try -#define _except __except -#define _finally __finally -#endif - -#endif diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h index a4bf19a72..dc42ac798 100644 --- a/winsup/w32api/include/windef.h +++ b/winsup/w32api/include/windef.h @@ -184,6 +184,19 @@ extern "C" { #endif #endif +/* FIXME: This will make some code compile. The programs will most + likely crash when an exception is raised, but at least they will + compile. */ +#if defined (__GNUC__) && defined (__SEH_NOP) +#define __try +#define __except(x) if (0) /* don't execute handler */ +#define __finally + +#define _try __try +#define _except __except +#define _finally __finally +#endif + typedef unsigned long DWORD; typedef int WINBOOL,*PWINBOOL,*LPWINBOOL; /* FIXME: Is there a good solution to this? */ diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index 5441e55cb..6934a8684 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -48,7 +48,6 @@ #include <windef.h> #include <wincon.h> #include <basetyps.h> -#include <excpt.h> #include <winbase.h> #ifndef _WINGDI_H #include <wingdi.h> |