From 93599ac0451f913b3277b7edacde122806573972 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 26 Jun 2005 13:25:39 +0000 Subject: [PATCH] Possibly to allow including both os2/private.h and GUI's private.h for X11 based builds on OS/2. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/private.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index c256c6df8d..b97c2bac5c 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -11,8 +11,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_PRIVATE_H_ -#define _WX_PRIVATE_H_ +#ifndef _WX_OS2_PRIVATE_H_ +#define _WX_OS2_PRIVATE_H_ #define INCL_BASE #define INCL_PM @@ -20,9 +20,7 @@ #define INCL_WINSYS #define INCL_SHLERRORS #include -#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(FCF_CLOSEBUTTON) -/* struct missing in "os2emx.h" - luckily FCF_CLOSEBUTTON was added in the - same version of os2emx.h as SPBCDATA type, so we can do the test above. */ +#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA) typedef struct _SPBCDATA { ULONG cbSize; /* Size of control block. */ ULONG ulTextLimit; /* Entryfield text limit. */ -- 2.47.2