incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1200721 - in /incubator/ooo/trunk/main: dbaccess/source/ui/dlg/odbcconfig.cxx unixODBC/inc/iodbcunix.h unixODBC/inc/sqltypes.h
Date Fri, 11 Nov 2011 03:16:21 GMT
Author: pfg
Date: Fri Nov 11 03:16:20 2011
New Revision: 1200721

URL: http://svn.apache.org/viewvc?rev=1200721&view=rev
Log:
i118582: OS/2 port - patch headers for unixodbc and dbaccess - by ydario.

Modified:
    incubator/ooo/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx
    incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h
    incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h

Modified: incubator/ooo/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx?rev=1200721&r1=1200720&r2=1200721&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx (original)
+++ incubator/ooo/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx Fri Nov 11 03:16:20 2011
@@ -108,10 +108,6 @@
 #endif // defined(WNT)
 // from here on you can do what you want to
 
-#if defined(OS2)
-#define SQL_API _System
-#endif // defined(OS2)
-
 #else
 
 #define ODBC_LIBRARY	""

Modified: incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h?rev=1200721&r1=1200720&r2=1200721&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h (original)
+++ incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h Fri Nov 11 03:16:20 2011
@@ -98,8 +98,10 @@
 #define PASCAL
 #define VOID			void
 #define CALLBACK
+#ifndef OS2
 #define _cdecl
 #define __stdcall
+#endif
 
 
 /*

Modified: incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h?rev=1200721&r1=1200720&r2=1200721&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h (original)
+++ incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h Fri Nov 11 03:16:20 2011
@@ -106,6 +106,8 @@ extern "C" {
 
 #ifdef WIN32
 #define SQL_API	__stdcall
+#elif defined(OS2)
+#define SQL_API _System
 #else
 #define SQL_API
 #endif
@@ -192,13 +194,18 @@ typedef SQLHANDLE		SQLHDESC;
 /*
  *  Window Handle
  */
-#if defined(WIN32) || defined (_WIN64) || defined(OS2)
+#if defined(WIN32) || defined (_WIN64)
 typedef void*			HWND;	/* Make up for no windows.h */
 typedef HWND			SQLHWND;
 #elif defined(macintosh)
 #include <Dialogs.h>
 typedef WindowPtr 		HWND;
 typedef HWND 			SQLHWND;
+#elif defined(OS2)
+#ifndef _OS2_H // YD define only if system headers are not included
+typedef SQLPOINTER 		HWND;
+#endif
+typedef SQLPOINTER 		SQLHWND;
 #else
 typedef SQLPOINTER 		HWND;
 typedef SQLPOINTER 		SQLHWND;



Mime
View raw message