added encoding conversion to wxHTML

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 4020d4cb921358f235cf97c293222637c488c226..d1717e5a402db2c8ffd9c9789cefba1eb4dc6b50 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -62,7 +62,10 @@
     #endif
 
     // Place other OS/2 compiler environment defines here
-    #define LINKAGEMODE _Optlink
+    #if defined(__VISAGECPP__)
+        // VisualAge is the only thing that understands _Optlink
+        #define LINKAGEMODE _Optlink
+    #endif
 #else   // Windows
     #ifndef __WINDOWS__
         #define __WINDOWS__
@@ -349,7 +352,6 @@ typedef int wxWindowID;
 #else
     // no stdcall under Unix nor Win16
     #define wxCALLBACK
-
 #endif // platform
 
 // callling convention for the qsort(3) callback
@@ -1800,6 +1802,8 @@ typedef WXHWND WXWidget;
             #define FAR _far
         #endif
     #endif // no FAR
+#else // Win32
+    #define FAR
 #endif // Win16/32
 
 #endif // MSW