Updated to Scintilla from 1.45 to 1.47

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

diff --git a/include/wx/isql.h b/include/wx/isql.h
index e971f02468c1ac970e7cf2614d9a92217c095c4d..5d4bb72fe2b1fc345cafa009e8028943a581a268 100644 (file)
--- a/include/wx/isql.h
+++ b/include/wx/isql.h
@@ -6,8 +6,8 @@
  *  iODBC defines
  *
  *  The iODBC driver manager.
  *  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
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public


@@ -36,8 +36,17 @@
 #elif defined(WIN32)
 #define SQL_API                                __stdcall
 
 #elif defined(WIN32)
 #define SQL_API                                __stdcall
 

-#ifndef FAR  
-#define FAR 
+#ifndef FAR
+#define FAR
+#endif
+
+#elif defined(__OS2__)
+#define SQL_API                                _Optlink
+
+#ifndef FAR
+#define FAR
+#define EXPORT
+#define CALLBACK

 #endif
 
 #else
 #endif
 
 #else


@@ -46,8 +55,10 @@
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
 
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
 

+#ifndef __EMX__

 typedef void *HWND;
 #endif
 typedef void *HWND;
 #endif

+#endif

 
 typedef void *SQLHWND;
 
 
 typedef void *SQLHWND;