Use new C++ sockets for everything except OS/2

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

diff --git a/include/wx/isql.h b/include/wx/isql.h
index da29383e6e7a245ba843d86a763b7550d4035f11..fd2f4c1ad8c6fda8ef9262b282a8e7e75de42330 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


@@ -26,23 +26,32 @@
 #ifndef _ISQL_H
 #define _ISQL_H
 
 #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
 
 #endif
 

-#elif defined(WIN32)
-#define SQL_API                                __stdcall

 #else
 #define FAR
 #define EXPORT
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
 
 #else
 #define FAR
 #define EXPORT
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
 

+#ifndef __EMX__

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

+#endif

 
 typedef void *SQLHWND;
 
 
 typedef void *SQLHWND;