* include/windef.h: Add no-op __try, __except, __finally

defines from ...
	* include/excpt.h: Remove file.
	* include/windows.h: Don't include excpt.h.
This commit is contained in:
Danny Smith 2002-06-01 20:38:33 +00:00
parent 60abf1c4b8
commit 748bc82966
4 changed files with 21 additions and 21 deletions

View File

@ -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

View File

@ -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

View File

@ -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? */

View File

@ -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>