X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2bcbdfbc798cccc134c192a4a0185035cd9303c..a7b7500c4f51834f2cf69d05e6a95e9048a8faf5:/include/wx/os2/private.h

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 024663695b..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 <os2.h>
-#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. */
@@ -303,7 +301,7 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont( LOGFONT*      pLogFont
                                            ,PFONTMETRICS  pFM
                                            ,PFACENAMEDESC pFace
                                           );
-WXDLLEXPORT int    wxGpiStrcmp(char* s0, char* s1);
+WXDLLEXPORT int    wxGpiStrcmp(wxChar* s0, wxChar* s1);
 
 WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
 WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);