X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56b79cb98da2e2e3024fce6f6313546577c34821..e27c99c7504d9168ee0ddd6043f942fd230027bc:/include/wx/isql.h?ds=sidebyside

diff --git a/include/wx/isql.h b/include/wx/isql.h
index da29383e6e..fd2f4c1ad8 100644
--- 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
@@ -26,23 +26,32 @@
 #ifndef _ISQL_H
 #define _ISQL_H
 
-#if defined(__WIN16__)
+#if defined(WIN32)
+#define SQL_API				__stdcall
 
-#define SQL_API EXPORT CALLBACK
-#ifndef EXPORT
-#define EXPORT _export
+#ifndef FAR
+#define FAR
+#endif
+
+#elif defined(__OS2__)
+#define SQL_API				_Optlink
+
+#ifndef FAR
+#define FAR
+#define EXPORT
+#define CALLBACK
 #endif
 
-#elif defined(WIN32)
-#define SQL_API				__stdcall
 #else
 #define FAR
 #define EXPORT
 #define CALLBACK
 #define SQL_API				EXPORT CALLBACK
 
+#ifndef __EMX__
 typedef void *HWND;
 #endif
+#endif
 
 typedef void *SQLHWND;