avoid a bug in Carbon headers

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

diff --git a/include/wx/isql.h b/include/wx/isql.h
index da29383e6e7a245ba843d86a763b7550d4035f11..5d4bb72fe2b1fc345cafa009e8028943a581a268 100644 (file)
--- a/include/wx/isql.h
+++ b/include/wx/isql.h
@@ -6,8 +6,8 @@
  *  iODBC defines
  *
  *  The iODBC driver manager.
- *  
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -35,14 +35,30 @@
 
 #elif defined(WIN32)
 #define SQL_API                                __stdcall
+
+#ifndef FAR
+#define FAR
+#endif
+
+#elif defined(__OS2__)
+#define SQL_API                                _Optlink
+
+#ifndef FAR
+#define FAR
+#define EXPORT
+#define CALLBACK
+#endif
+
 #else
 #define FAR
 #define EXPORT
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
 
+#ifndef __EMX__
 typedef void *HWND;
 #endif
+#endif
 
 typedef void *SQLHWND;