removed a condition (l. 124) that always eval to true

[wxWidgets.git] / src / xpm / xpm34.h

diff --git a/src/xpm/xpm34.h b/src/xpm/xpm34.h
index fba32dbc2b095aa795204da20ee0fa45d79d499a..94071dec63a266295d9d86d8dd608ba03166d165 100644 (file)
--- a/src/xpm/xpm34.h
+++ b/src/xpm/xpm34.h
@@ -40,7 +40,11 @@
 #ifndef XPM_h
 #define XPM_h
 
-#if defined(_WINDOWS) || defined(__WXMSW__) || defined(WIN32)
+#if (defined(_WINDOWS) || defined(__WXMSW__) || defined(WIN32)) && !defined(FOR_MSW)
+#define FOR_MSW
+#endif
+/* Piggyback on MSW for now */
+#if (defined(__OS2__) || defined(__WXPM__) || defined(OS232)) && !defined(FOR_MSW)
 #define FOR_MSW
 #endif
 
@@ -271,7 +275,7 @@ extern "C" {
  * arguments to be corrupted espec. in XpmWriteFileFromXpmImage.
  * So, define all prototypes explicitly.
  */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__OS2__)
 
 /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
 
@@ -511,7 +515,7 @@ extern "C" {
                                            XpmInfo *info));
 
 #endif // _MSC_VER
-                                           
+                                       
 #ifdef __cplusplus
 } /* for C++ V2.0 */
 #endif