From 79ebe32ef12392c698cd5afa05accfe107f50b5d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 6 Apr 2012 19:51:20 +0000 Subject: [PATCH] Remove special setup_gccxml.h for GCCXML. This file doesn't seem to be needed and the open() declaration in it actually results in errors when using the latest gccxml from cvs under Windows, so just get rid of it entirely. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chkconf.h | 2 +- include/wx/platform.h | 9 --------- include/wx/setup_gccxml.h | 23 ----------------------- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 include/wx/setup_gccxml.h diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 4b069bebc8..b1c741e43d 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -1451,7 +1451,7 @@ */ #if wxUSE_GUI -#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) && !defined(__GCCXML__) +#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW" # else diff --git a/include/wx/platform.h b/include/wx/platform.h index 50476b9e5f..cdd8b9ce48 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -153,15 +153,6 @@ */ #include "wx/setup.h" -#ifdef __GCCXML__ - /* - we're using gccxml to create an XML representation of the entire - wxWidgets interface; use a special setup_gccxml.h file to fix some - of the stuff #defined by the real setup.h - */ - #include "wx/setup_gccxml.h" -#endif - /* Convenience for any optional classes that use the wxAnyButton base class. */ diff --git a/include/wx/setup_gccxml.h b/include/wx/setup_gccxml.h deleted file mode 100644 index baa6cbd96f..0000000000 --- a/include/wx/setup_gccxml.h +++ /dev/null @@ -1,23 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/setup_gccxml.h -// Purpose: setup.h settings for gccxml (see utils/ifacecheck) -// Author: Francesco Montorsi -// Modified by: -// RCS-ID: $Id$ -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - This file is included by wx/platform.h when gccxml is detected. - - Here we fix some of the things declared in the real setup.h which gccxml doesn't - like. -*/ - - -// gccxml 0.9.0 doesn't like the fcntl2.h which is part of GNU C library -// (at least it doesn't on x86_64 systems!) -#define _FCNTL_H -int open (const char *__path, int __oflag, ...); - -- 2.45.2