Changeset 22139 for trunk/include/os2wrap.h

Timestamp:

Jul 29, 2017, 4:48:45 PM (8 years ago)

Author:

dmik

Message:

Fix os2safe.h warnings.

File:

• trunk/include/os2wrap.h (modified) (1 diff)

trunk/include/os2wrap.h

@@ -7 +7 @@
 #ifndef USE_OS2_TOOLKIT_HEADERS
 
-// be compatible with the toolkit
+// add missing declarations
+typedef unsigned short APIRET16;
+#define APIENTRY16 _Far16 _Pascal
+
+#define INCL_LONGLONG_STRUCTS
+
+#else // ifndef USE_OS2_TOOLKIT_HEADERS
+
+#undef _Pascal
+#define _Pascal _System // For Vio/Kbd/Mou
+
+#endif // ifndef USE_OS2_TOOLKIT_HEADERS
+
+#endif // ifdef __EMX__
+
+#include <os2.h>
+
+#ifdef __EMX__
+#ifndef USE_OS2_TOOLKIT_HEADERS
+// be compatible with the toolkit (note we do it after os2.h inclusion to avoid
+// os2safe.h barfing)
 #define OS2_INCLUDED
 #define OS2DEF_INCLUDED
 #define WIN_INCLUDED
 #define __OS2_H__
-
-// add missing declarations
-typedef unsigned short APIRET16;
-#define APIENTRY16 _Far16 _Pascal
-
-#define INCL_LONGLONG_STRUCTS
-
-#else // ifndef USE_OS2_TOOLKIT_HEADERS
-
-#undef _Pascal
-#define _Pascal _System // For Vio/Kbd/Mou
-
-#endif // ifndef USE_OS2_TOOLKIT_HEADERS
-
-#endif // ifdef __EMX__
-
-#include <os2.h>
+#endif
+#endif
+
 #include <os2sel.h>
 #include <os2newapi.h>