You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2011/10/07 18:30:14 UTC
svn commit: r1180091 - in /incubator/ooo/trunk/main/unixODBC/inc:
iodbcunix.h sql.h sqlext.h sqltypes.h sqlucode.h
Author: pfg
Date: Fri Oct 7 16:30:13 2011
New Revision: 1180091
URL: http://svn.apache.org/viewvc?rev=1180091&view=rev
Log:
Update iodbc headers to 2009 version: moved iodbcunix.h from sql.h to sqltypes.h. While here, comment local change.
Modified:
incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h
incubator/ooo/trunk/main/unixODBC/inc/sql.h
incubator/ooo/trunk/main/unixODBC/inc/sqlext.h
incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h
incubator/ooo/trunk/main/unixODBC/inc/sqlucode.h
Modified: incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h?rev=1180091&r1=1180090&r2=1180091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h (original)
+++ incubator/ooo/trunk/main/unixODBC/inc/iodbcunix.h Fri Oct 7 16:30:13 2011
@@ -1,14 +1,14 @@
/*
* iodbcunix.h
*
- * $Id: iodbcunix.h,v 1.7 2006/01/24 15:02:23 source Exp $
+ * $Id: iodbcunix.h,v 1.8 2009/08/30 10:48:32 source Exp $
*
* ODBC defines for Unix
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <ke...@empress.com>
- * Copyright (C) 1996-2006 by OpenLink Software <io...@openlinksw.com>
+ * Copyright (C) 1996-2009 by OpenLink Software <io...@openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
Modified: incubator/ooo/trunk/main/unixODBC/inc/sql.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unixODBC/inc/sql.h?rev=1180091&r1=1180090&r2=1180091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unixODBC/inc/sql.h (original)
+++ incubator/ooo/trunk/main/unixODBC/inc/sql.h Fri Oct 7 16:30:13 2011
@@ -1,14 +1,14 @@
/*
* sql.h
*
- * $Id: sql.h,v 1.9 2006/01/20 15:58:34 source Exp $
+ * $Id: sql.h,v 1.11 2009/09/09 20:06:24 source Exp $
*
* ODBC defines
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <ke...@empress.com>
- * Copyright (C) 1996-2006 by OpenLink Software <io...@openlinksw.com>
+ * Copyright (C) 1996-2009 by OpenLink Software <io...@openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
@@ -85,13 +85,6 @@
#define ODBCVER 0x0351
#endif
-/*
- * Include Windows style defines and typedefs on Unix
- */
-#ifndef _IODBCUNIX_H
-#include <odbc/iodbcunix.h>
-#endif
-
#ifndef _SQLTYPES_H
#include <odbc/sqltypes.h>
#endif
Modified: incubator/ooo/trunk/main/unixODBC/inc/sqlext.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unixODBC/inc/sqlext.h?rev=1180091&r1=1180090&r2=1180091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unixODBC/inc/sqlext.h (original)
+++ incubator/ooo/trunk/main/unixODBC/inc/sqlext.h Fri Oct 7 16:30:13 2011
@@ -1,14 +1,14 @@
/*
* sqlext.h
*
- * $Id: sqlext.h,v 1.10 2006/01/20 15:58:34 source Exp $
+ * $Id: sqlext.h,v 1.11 2009/08/30 10:48:32 source Exp $
*
* ODBC defines (ext)
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <ke...@empress.com>
- * Copyright (C) 1996-2006 by OpenLink Software <io...@openlinksw.com>
+ * Copyright (C) 1996-2009 by OpenLink Software <io...@openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
Modified: incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h?rev=1180091&r1=1180090&r2=1180091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h (original)
+++ incubator/ooo/trunk/main/unixODBC/inc/sqltypes.h Fri Oct 7 16:30:13 2011
@@ -1,14 +1,14 @@
/*
* sqltypes.h
*
- * $Id: sqltypes.h,v 1.23 2007/10/07 13:27:13 source Exp $
+ * $Id: sqltypes.h,v 1.25 2009/09/09 20:06:24 source Exp $
*
* ODBC typedefs
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <ke...@empress.com>
- * Copyright (C) 1996-2006 by OpenLink Software <io...@openlinksw.com>
+ * Copyright (C) 1996-2009 by OpenLink Software <io...@openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
@@ -78,7 +78,6 @@
#ifndef _SQLTYPES_H
#define _SQLTYPES_H
-
/*
* Set default specification to ODBC 3.51
*/
@@ -86,6 +85,13 @@
#define ODBCVER 0x0351
#endif
+/*
+ * Include Windows style defines and typedefs on Unix
+ */
+#ifndef _IODBCUNIX_H
+#include <odbc/iodbcunix.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -187,7 +193,7 @@ typedef SQLHANDLE SQLHDESC;
* Window Handle
*/
#if defined(WIN32) || defined (_WIN64) || defined(OS2)
-typedef void* HWND;
+typedef void* HWND; /* Make up for no windows.h */
typedef HWND SQLHWND;
#elif defined(macintosh)
#include <Dialogs.h>
Modified: incubator/ooo/trunk/main/unixODBC/inc/sqlucode.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unixODBC/inc/sqlucode.h?rev=1180091&r1=1180090&r2=1180091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unixODBC/inc/sqlucode.h (original)
+++ incubator/ooo/trunk/main/unixODBC/inc/sqlucode.h Fri Oct 7 16:30:13 2011
@@ -1,13 +1,13 @@
/*
* sqlucode.h
*
- * $Id: sqlucode.h,v 1.5 2006/01/24 11:28:34 source Exp $
+ * $Id: sqlucode.h,v 1.6 2009/08/30 10:48:32 source Exp $
*
* ODBC Unicode defines
*
* The iODBC driver manager.
*
- * Copyright (C) 1996-2006 by OpenLink Software <io...@openlinksw.com>
+ * Copyright (C) 1996-2009 by OpenLink Software <io...@openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following