From 0c3e54b7f50a092dfd48b1ed3057d8aba6da33ac Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@redhat.com>
Date: Tue, 10 Jan 2012 14:26:52 -0500
Subject: [PATCH] Update to version 2.3.1

---
 .gitignore             |    2 +-
 README.fedora          |   33 +
 conffile.h             |    2 +
 enable-items.patch     |   52 --
 isql-fixes.patch       |   70 --
 libtool-config.patch   |   55 --
 multilib-config.patch  |   50 --
 odbcinst.ini           |    4 +-
 odbcint64-config.patch |   26 -
 so-version-bump.patch  |  210 ++---
 sources                |    2 +-
 unixODBC.spec          |   82 +-
 warning-cleanup.patch  | 1713 ----------------------------------------
 13 files changed, 144 insertions(+), 2157 deletions(-)
 create mode 100644 README.fedora
 delete mode 100644 enable-items.patch
 delete mode 100644 isql-fixes.patch
 delete mode 100644 libtool-config.patch
 delete mode 100644 multilib-config.patch
 delete mode 100644 odbcint64-config.patch
 delete mode 100644 warning-cleanup.patch

diff --git a/.gitignore b/.gitignore
index ba74027..82884db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-unixODBC-2.2.14.tar.gz
+/unixODBC-2.3.1.tar.gz
diff --git a/README.fedora b/README.fedora
new file mode 100644
index 0000000..762abf0
--- /dev/null
+++ b/README.fedora
@@ -0,0 +1,33 @@
+About unixODBC in Fedora
+------------------------
+
+In addition to the unixODBC package itself, you will want to install some
+or all of these related packages:
+
+mysql-connector-odbc	MySQL driver, needed to connect to MySQL databases
+postgresql-odbc		PostgreSQL driver, needed to connect to PostgreSQL
+unixODBC-gui-qt		Optional configuration management and test programs
+
+
+The recommended driver definition for MySQL is:
+
+[MySQL]
+Description	= ODBC for MySQL
+Driver		= /usr/lib/libmyodbc5.so
+Setup		= /usr/lib/libodbcmyS.so
+Driver64	= /usr/lib64/libmyodbc5.so
+Setup64		= /usr/lib64/libodbcmyS.so
+FileUsage	= 1
+
+You can adjust the name (in square brackets) and the description, but
+the other items should usually be used verbatim.
+
+The recommended driver definition for PostgreSQL is:
+
+[PostgreSQL]
+Description	= ODBC for PostgreSQL
+Driver		= /usr/lib/psqlodbcw.so
+Setup		= /usr/lib/libodbcpsqlS.so
+Driver64	= /usr/lib64/psqlodbcw.so
+Setup64		= /usr/lib64/libodbcpsqlS.so
+FileUsage	= 1
diff --git a/conffile.h b/conffile.h
index 3966396..0996b35 100644
--- a/conffile.h
+++ b/conffile.h
@@ -12,6 +12,8 @@
  */
 #if defined(__x86_64__)
 #include "CONFFILE_x86_64.h"
+#elif defined(__ia64__)
+#include "CONFFILE_ia64.h"
 #elif defined(__i386__)
 #include "CONFFILE_i386.h"
 #elif defined(__ppc64__) || defined(__powerpc64__)
diff --git a/enable-items.patch b/enable-items.patch
deleted file mode 100644
index f53db3f..0000000
--- a/enable-items.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Allow drivers to be selected in ODBCConfig, per bug 544852.
-
-
-diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp
---- unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp	2008-09-04 10:55:54.000000000 -0400
-+++ unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp	2009-12-19 18:31:39.000000000 -0500
-@@ -346,15 +346,15 @@
-             setRowCount( nElement + 1 );
- 
-             ptablewidgetitem = new QTableWidgetItem( szSectionName );
--            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
-+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
-             setItem( nElement, 0, ptablewidgetitem );
- 
-             ptablewidgetitem = new QTableWidgetItem( szDescription );
--            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
-+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
-             setItem( nElement, 1, ptablewidgetitem );
- 
-             ptablewidgetitem = new QTableWidgetItem( szDriver );
--            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
-+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
-             setItem( nElement, 2, ptablewidgetitem );
- 		}
- 		SQLSetConfigMode( ODBC_BOTH_DSN );
-diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp
---- unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp	2008-09-04 11:57:53.000000000 -0400
-+++ unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp	2009-12-19 18:31:29.000000000 -0500
-@@ -852,19 +852,19 @@
-             setRowCount( nRow + 1 );
- 
-             ptablewidgetitem = new QTableWidgetItem( szDriverName );
--            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
-+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
-             setItem( nRow, 0, ptablewidgetitem );
- 
-             ptablewidgetitem = new QTableWidgetItem( szDescription );
--            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
-+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
-             setItem( nRow, 1, ptablewidgetitem );
- 
-             ptablewidgetitem = new QTableWidgetItem( szDriver );
--            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
-+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
-             setItem( nRow, 2, ptablewidgetitem );
- 
-             ptablewidgetitem = new QTableWidgetItem( szSetup );
--            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
-+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
-             setItem( nRow, 3, ptablewidgetitem );
- 
-             nRow++;
diff --git a/isql-fixes.patch b/isql-fixes.patch
deleted file mode 100644
index f7026c9..0000000
--- a/isql-fixes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Back-patch assorted fixes in isql.c from 2.3.0; notably, remove duplicate
-variable declarations that caused bug #628909, and fix some potential
-64-bit portability problems.
-
-
-diff -Naur unixODBC-2.2.14.orig/exe/isql.c unixODBC-2.2.14/exe/isql.c
---- unixODBC-2.2.14.orig/exe/isql.c	2008-06-16 07:03:43.000000000 -0400
-+++ unixODBC-2.2.14/exe/isql.c	2010-08-31 14:30:26.912367399 -0400
-@@ -243,9 +243,6 @@
-         }
-         else
-         {
--            char *line;
--            int malloced;
--
-             line = fgets( line_buffer, line_buffer_size, stdin );
-             if ( !line )        /* EOF - ctrl D */
-             {
-@@ -300,7 +297,7 @@
-                 exec_now = 1;
-                 len --;
-             }
--            else if ( len == 2 && memcmp( line, "go", 2 ) == 0 )
-+            else if ( len == 3 && memcmp( line, "go", 2 ) == 0 )
-             {
-                 exec_now = 1;
-                 dont_copy = 1;
-@@ -867,7 +864,7 @@
-         }
-     }
- 
--    if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, SQL_NTS ) != SQL_SUCCESS )
-+    if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, strlen( szSQL )) != SQL_SUCCESS )
-     {
-         if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
-         fprintf( stderr, "[ISQL]ERROR: Could not SQLPrepare\n" );
-@@ -1364,10 +1361,10 @@
- 
-         /* HDR */
-         sret = sprintf( (char*)szColumn, "| %-*.*s",
--                        nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnName );
-+                        (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnName );
-         if (sret < 0)
-             sprintf((char *)szColumn, "| %-*.*s",
--                    nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**");
-+                    (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**");
-         strcat( (char*)szHdrLine,(char*) szColumn );
-     }
-     strcat((char*) szSepLine, "+\n" );
-@@ -1413,9 +1410,9 @@
-             if ( nReturn == SQL_SUCCESS && nIndicator != SQL_NULL_DATA )
-             {
-                 sret = sprintf( (char*)szColumn, "| %-*.*s",
--                                nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnValue );
-+                                (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnValue );
-                 if (sret < 0) sprintf( (char*)szColumn, "| %-*.*s",
--                                       nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**" );
-+                                       (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**" );
- 
-             }
-             else if ( nReturn == SQL_ERROR )
-@@ -1424,7 +1421,7 @@
-             }
-             else
-             {
--                sprintf( (char*)szColumn, "| %-*s", nOptimalDisplayWidth, "" );
-+                sprintf( (char*)szColumn, "| %-*s", (int)nOptimalDisplayWidth, "" );
-             }
-             fputs( (char*)szColumn, stdout );
-         } /* for columns */
diff --git a/libtool-config.patch b/libtool-config.patch
deleted file mode 100644
index a3d6919..0000000
--- a/libtool-config.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-unixODBC doesn't actually succeed if you try to build with the system libltdl.
-Take out code that expects libltdl to exist locally.
-
-
-diff -Naur unixODBC-2.2.14.orig/Makefile.am unixODBC-2.2.14/Makefile.am
---- unixODBC-2.2.14.orig/Makefile.am	2008-09-02 08:29:31.000000000 -0400
-+++ unixODBC-2.2.14/Makefile.am	2009-02-15 22:27:55.000000000 -0500
-@@ -3,7 +3,6 @@
- 	log \
- 	lst \
- 	ini \
--	libltdl \
- 	odbcinst \
- 	DriverManager \
- 	odbcinstQ \
-diff -Naur unixODBC-2.2.14.orig/configure.in unixODBC-2.2.14/configure.in
---- unixODBC-2.2.14.orig/configure.in	2008-11-19 11:08:40.000000000 -0500
-+++ unixODBC-2.2.14/configure.in	2009-02-16 00:45:22.000000000 -0500
-@@ -165,27 +165,12 @@
- INCLTDL=""
- LIBLTDL=""
- 
--AC_MSG_CHECKING( Have we enabled using RTLD_GROUP )
--if test "x$rtldgroup" = "xtrue"; then
--AC_MSG_RESULT( yes )
--AC_LIBLTDL_CONVENIENCE
--else
--AC_MSG_RESULT( no );
--AC_LIBLTDL_CONVENIENCE_G
--fi
--
- dnl Check for dlopen support
- AC_LIBTOOL_DLOPEN
- 
--dnl for cygwin support
--AC_LIBTOOL_WIN32_DLL
--
- dnl Configure libtool
- AM_PROG_LIBTOOL
- 
--dnl Configure libltdl
--AC_CONFIG_SUBDIRS(libltdl)
--
- use_builtin_libtool="no"
- 
- dnl override the libtool lines if we use the system libs
-@@ -517,7 +502,7 @@
- AM_CONDITIONAL(DRIVERS, test "x$drivers" = "xtrue" )
- AM_CONDITIONAL(FDB, test "x$fdb" = "xtrue" )
- AM_CONDITIONAL(QNX, test "x$qnx" = "xtrue" )
--AM_CONDITIONAL(WITHLT, test "x$use_builtin_libtool" = "xyes" )
-+AM_CONDITIONAL(WITHLT, test "x$use_builtin_libtool" = "xno" )
- AM_CONDITIONAL(ODBCTRACE, test "x$odbctrace" = "xtrue" )
- 
- dnl This blows up due to what I think is a bug in automake 1.6.3
diff --git a/multilib-config.patch b/multilib-config.patch
deleted file mode 100644
index d9912c9..0000000
--- a/multilib-config.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-unixODBC's configure tends to pick the wrong libraries on a multilib
-machine.  Force it to use the location reported by /etc/profile.d/qt.sh
-which we invoke in the specfile (yeah, a crude hack...)
-
-
-diff -Naur unixODBC-2.2.14.orig/qt.m4 unixODBC-2.2.14/qt.m4
---- unixODBC-2.2.14.orig/qt.m4	2008-06-30 11:13:44.000000000 -0400
-+++ unixODBC-2.2.14/qt.m4	2008-11-25 12:01:47.000000000 -0500
-@@ -230,40 +230,7 @@
- 
-   # Ensure we have the lib dir...
-   if test "x$qt_libraries" = "x" ; then
--    # see if it is relative to the includes
--    qt_tree="$qt_includes"
--
--	#
--	# the cygwin dirhame only strips up to the first /
--	#
--
--	case $host_os in
--	  cygwin*) empty_dir="x/" ;;
--	  *) empty_dir="x" ;;
--	esac
--
--    while test "x$qt_tree" != $empty_dir ; do
--      # first go around will fail...
--      if expr "$QTVERSION" '>=' "040000" > /dev/null ; then
--        if ls $qt_tree/lib/libQt* > /dev/null 2> /dev/null ; then
--          qt_libraries=$qt_tree/lib
--          break
--        else
--          # lop off tail of path
--          dnl not as portable as it should be...
--          qt_tree="`dirname $qt_tree`"
--	fi
--      else
--        if ls $qt_tree/lib/libqt* > /dev/null 2> /dev/null ; then
--          qt_libraries=$qt_tree/lib
--          break
--        else
--          # lop off tail of path
--          dnl not as portable as it should be...
--          qt_tree="`dirname $qt_tree`"
--	fi
--      fi
--    done
-+    qt_libraries="$QTLIB"
-   fi  
- 
-   # Use QTVERSION and gotthread to set libs we need...
diff --git a/odbcinst.ini b/odbcinst.ini
index 29ea10a..9038b05 100644
--- a/odbcinst.ini
+++ b/odbcinst.ini
@@ -4,9 +4,9 @@
 # Setup from the unixODBC package
 [PostgreSQL]
 Description	= ODBC for PostgreSQL
-Driver		= /usr/lib/psqlodbc.so
+Driver		= /usr/lib/psqlodbcw.so
 Setup		= /usr/lib/libodbcpsqlS.so
-Driver64	= /usr/lib64/psqlodbc.so
+Driver64	= /usr/lib64/psqlodbcw.so
 Setup64		= /usr/lib64/libodbcpsqlS.so
 FileUsage	= 1
 
diff --git a/odbcint64-config.patch b/odbcint64-config.patch
deleted file mode 100644
index 902a656..0000000
--- a/odbcint64-config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix output of odbc_config --header, per bug #518623.
-This error results in SQLBIGINT and SQLUBIGINT being misdefined as
-int, where they need to be [unsigned] long or long long.
-
-
-diff -Naur unixODBC-2.2.14.orig/exe/odbc-config.c unixODBC-2.2.14/exe/odbc-config.c
---- unixODBC-2.2.14.orig/exe/odbc-config.c	2008-05-20 08:58:17.000000000 -0400
-+++ unixODBC-2.2.14/exe/odbc-config.c	2009-08-21 14:15:35.000000000 -0400
-@@ -66,12 +66,15 @@
-     printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
- #endif
- 
-+#define xstr(s) str(s)
-+#define str(s) #s
-+
- #ifdef ODBCINT64
--    printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
-+    printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", xstr(ODBCINT64) );
- #endif
- 
- #ifdef UODBCINT64
--    printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
-+    printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", xstr(UODBCINT64) );
- #endif
- 
- #ifdef DISABLE_INI_CACHING
diff --git a/so-version-bump.patch b/so-version-bump.patch
index f902f73..4b3249a 100644
--- a/so-version-bump.patch
+++ b/so-version-bump.patch
@@ -2,21 +2,9 @@ Set the major .so version to 2 for all unixODBC shared libraries, to reflect
 the incompatible ABI changes in 2.2.14.
 
 
-diff -Naur unixODBC-2.2.14.orig/configure.in unixODBC-2.2.14/configure.in
---- unixODBC-2.2.14.orig/configure.in	2008-11-19 11:08:40.000000000 -0500
-+++ unixODBC-2.2.14/configure.in	2009-02-16 11:56:53.000000000 -0500
-@@ -546,7 +546,7 @@
- dnl This is the unixODBC source tree
- AC_DEFINE(UNIXODBC_SOURCE)
- 
--LIB_VERSION="1:0:0"
-+LIB_VERSION="2:0:0"
- AC_SUBST(LIB_VERSION)
- 
- AC_OUTPUT( Makefile \
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.2.14/DRVConfig/Mimer/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/Mimer/Makefile.am	2008-06-17 06:14:07.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/Mimer/Makefile.am	2009-02-16 11:59:31.000000000 -0500
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am	2011-12-02 14:01:00.153970964 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -24,11 +12,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.2.14/DRVC
 -libmimerS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
 +libmimerS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.2.14/DRVConfig/MiniSQL/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/MiniSQL/Makefile.am	2008-06-17 06:14:17.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/MiniSQL/Makefile.am	2009-02-16 11:59:27.000000000 -0500
+ libmimerS_la_SOURCES = mimerS.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am	2011-12-02 14:00:40.257679498 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -36,11 +24,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.2.14/DR
 -libodbcminiS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libodbcminiS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.2.14/DRVConfig/MySQL/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/MySQL/Makefile.am	2008-06-17 06:14:23.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/MySQL/Makefile.am	2009-02-16 11:59:50.000000000 -0500
+ libodbcminiS_la_SOURCES = odbcminiS.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am	2011-12-02 14:00:46.656773720 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -48,11 +36,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.2.14/DRVC
 -libodbcmyS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libodbcmyS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.2.14/DRVConfig/Oracle/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/Oracle/Makefile.am	2008-06-17 06:14:29.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/Oracle/Makefile.am	2009-02-16 11:59:07.000000000 -0500
+ libodbcmyS_la_SOURCES = odbcmyS.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am	2011-12-02 14:00:49.946821471 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -60,11 +48,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.2.14/DRV
 -liboraodbcS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +liboraodbcS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.2.14/DRVConfig/PostgreSQL/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/PostgreSQL/Makefile.am	2008-06-17 06:14:35.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/PostgreSQL/Makefile.am	2009-02-16 11:59:01.000000000 -0500
+ liboraodbcS_la_SOURCES = oraodbcS.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am	2011-12-02 14:00:29.193516374 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -72,11 +60,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.2.14
 -libodbcpsqlS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libodbcpsqlS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.2.14/DRVConfig/drvcfg1/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/drvcfg1/Makefile.am	2008-06-17 06:14:40.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/drvcfg1/Makefile.am	2009-02-16 12:00:00.000000000 -0500
+ libodbcpsqlS_la_SOURCES = odbcpsqlS.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am	2011-12-02 14:00:53.361871162 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -84,11 +72,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.2.14/DR
 -libodbcdrvcfg1S_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libodbcdrvcfg1S_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.2.14/DRVConfig/drvcfg2/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/drvcfg2/Makefile.am	2008-06-17 06:14:45.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/drvcfg2/Makefile.am	2009-02-16 11:58:39.000000000 -0500
+ libodbcdrvcfg1S_la_SOURCES = drvcfg1.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am	2011-12-02 14:00:25.249459261 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -96,11 +84,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.2.14/DR
 -libodbcdrvcfg2S_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libodbcdrvcfg2S_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/esoob/Makefile.am unixODBC-2.2.14/DRVConfig/esoob/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/esoob/Makefile.am	2008-06-17 06:14:50.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/esoob/Makefile.am	2009-02-16 11:59:41.000000000 -0500
+ libodbcdrvcfg2S_la_SOURCES = drvcfg2.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am unixODBC-2.3.1/DRVConfig/esoob/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/esoob/Makefile.am	2011-12-02 14:00:36.802629045 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -108,11 +96,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/esoob/Makefile.am unixODBC-2.2.14/DRVC
 -libesoobS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libesoobS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/nn/Makefile.am unixODBC-2.2.14/DRVConfig/nn/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/nn/Makefile.am	2008-06-17 06:14:56.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/nn/Makefile.am	2009-02-16 11:59:18.000000000 -0500
+ libesoobS_la_SOURCES = esoobS.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am unixODBC-2.3.1/DRVConfig/nn/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/nn/Makefile.am	2011-12-02 14:00:16.113323779 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -120,11 +108,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/nn/Makefile.am unixODBC-2.2.14/DRVConf
 -libodbcnnS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libodbcnnS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.2.14/DRVConfig/oplodbc/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/oplodbc/Makefile.am	2008-06-17 06:15:01.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/oplodbc/Makefile.am	2009-02-16 11:58:56.000000000 -0500
+ libodbcnnS_la_SOURCES = drvcfg.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am	2011-12-02 14:00:20.992397039 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -132,11 +120,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.2.14/DR
 -liboplodbcS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +liboplodbcS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.2.14/DRVConfig/sapdb/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/sapdb/Makefile.am	2008-06-17 06:15:07.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/sapdb/Makefile.am	2009-02-16 11:59:12.000000000 -0500
+ liboplodbcS_la_SOURCES = oplodbc.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am	2011-12-02 14:00:43.360724987 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -144,11 +132,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.2.14/DRVC
 -libsapdbS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libsapdbS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
+ libsapdbS_la_SOURCES = sapdb.c
  
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/tds/Makefile.am unixODBC-2.2.14/DRVConfig/tds/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/tds/Makefile.am	2008-06-17 06:15:20.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/tds/Makefile.am	2009-02-16 11:59:36.000000000 -0500
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am unixODBC-2.3.1/DRVConfig/tds/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/tds/Makefile.am	2011-12-02 14:00:56.753921152 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -156,11 +144,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/tds/Makefile.am unixODBC-2.2.14/DRVCon
 -libtdsS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libtdsS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/DRVConfig/txt/Makefile.am unixODBC-2.2.14/DRVConfig/txt/Makefile.am
---- unixODBC-2.2.14.orig/DRVConfig/txt/Makefile.am	2008-06-17 06:15:31.000000000 -0400
-+++ unixODBC-2.2.14/DRVConfig/txt/Makefile.am	2009-02-16 11:59:55.000000000 -0500
+ libtdsS_la_SOURCES = tdsS.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am unixODBC-2.3.1/DRVConfig/txt/Makefile.am
+--- unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am	2009-12-11 11:54:07.000000000 -0500
++++ unixODBC-2.3.1/DRVConfig/txt/Makefile.am	2011-12-02 14:00:32.929572613 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@@ -168,12 +156,12 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/txt/Makefile.am unixODBC-2.2.14/DRVCon
 -libodbctxtS_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libodbctxtS_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.2.14/Drivers/MiniSQL/Makefile.am
---- unixODBC-2.2.14.orig/Drivers/MiniSQL/Makefile.am	2008-06-17 06:16:11.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/MiniSQL/Makefile.am	2009-02-16 12:00:22.000000000 -0500
-@@ -196,6 +196,6 @@
+ libodbctxtS_la_SOURCES = drvcfg.c
+ 	
+diff -Naur unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am
+--- unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am	2009-12-11 11:54:09.000000000 -0500
++++ unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am	2011-12-02 14:01:30.797419661 -0500
+@@ -193,6 +193,6 @@
  	sqlFreeEnv.c \
  	sqlFreeStmt.c 
  
@@ -181,11 +169,11 @@ diff -Naur unixODBC-2.2.14.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.2.14/Driv
 +libodbcmini_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) \
  	-L@msql_libraries@ -lmsql -module
  
-diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.2.14/Drivers/Postgre7.1/Makefile.am
---- unixODBC-2.2.14.orig/Drivers/Postgre7.1/Makefile.am	2008-06-17 12:09:03.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/Postgre7.1/Makefile.am	2009-02-16 12:02:30.000000000 -0500
+diff -Naur unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am
+--- unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am	2009-12-11 11:54:08.000000000 -0500
++++ unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am	2011-12-02 14:01:24.860333250 -0500
 @@ -3,7 +3,7 @@
- INCLUDES = -I@top_srcdir@/include
+ INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
  
  libodbcpsql_la_LDFLAGS = \
 -	-version-info 2:0:0 \
@@ -193,21 +181,9 @@ diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.2.14/D
  	-no-undefined \
  	$(LIBSOCKET) $(LIBNSL) \
  	-export-dynamic \
-diff -Naur unixODBC-2.2.14.orig/Drivers/PostgreSQL/Makefile.am unixODBC-2.2.14/Drivers/PostgreSQL/Makefile.am
---- unixODBC-2.2.14.orig/Drivers/PostgreSQL/Makefile.am	2008-06-17 06:16:48.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/PostgreSQL/Makefile.am	2009-02-16 12:00:05.000000000 -0500
-@@ -4,7 +4,7 @@
- 
- libodbcpsql_la_LDFLAGS = \
- 	-no-undefined \
--	-version-info 1:0:0 \
-+	-version-info $(LIB_VERSION) \
- 	$(LIBSOCKET) $(LIBNSL) \
- 	-module
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/nn/Makefile.am unixODBC-2.2.14/Drivers/nn/Makefile.am
---- unixODBC-2.2.14.orig/Drivers/nn/Makefile.am	2008-06-17 06:16:54.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/nn/Makefile.am	2009-02-16 12:00:16.000000000 -0500
+diff -Naur unixODBC-2.3.1.orig/Drivers/nn/Makefile.am unixODBC-2.3.1/Drivers/nn/Makefile.am
+--- unixODBC-2.3.1.orig/Drivers/nn/Makefile.am	2009-12-11 11:54:09.000000000 -0500
++++ unixODBC-2.3.1/Drivers/nn/Makefile.am	2011-12-02 14:01:07.828083493 -0500
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I@top_srcdir@/include -I.
@@ -215,39 +191,17 @@ diff -Naur unixODBC-2.2.14.orig/Drivers/nn/Makefile.am unixODBC-2.2.14/Drivers/n
 -libnn_la_LDFLAGS = -no-undefined  -version-info 1:0:0 -module
 +libnn_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) -module
  
- DEFS = -DUNIXODBC @DEFS@
+ EXTRA_DIST = \
+ 	nnconfig.h \
+diff -Naur unixODBC-2.3.1.orig/Drivers/template/Makefile.am unixODBC-2.3.1/Drivers/template/Makefile.am
+--- unixODBC-2.3.1.orig/Drivers/template/Makefile.am	2009-12-11 11:54:09.000000000 -0500
++++ unixODBC-2.3.1/Drivers/template/Makefile.am	2011-12-02 14:01:12.828156445 -0500
+@@ -2,7 +2,7 @@
  
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/Makefile.am unixODBC-2.2.14/Drivers/template/Makefile.am
---- unixODBC-2.2.14.orig/Drivers/template/Makefile.am	2008-06-17 06:17:03.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/template/Makefile.am	2009-02-16 12:00:11.000000000 -0500
-@@ -4,7 +4,7 @@
- 
- DEFS = -DUNIXODBC @DEFS@
+ INCLUDES = -I@top_srcdir@/include -I. $(LTDLINCL)
  
 -libtemplate_la_LDFLAGS = -no-undefined  -version-info 1:0:0 
 +libtemplate_la_LDFLAGS = -no-undefined  -version-info $(LIB_VERSION) 
  
  EXTRA_DIST = \
  	driver.h \
-diff -Naur unixODBC-2.2.14.orig/odbcinstQ/Makefile.am unixODBC-2.2.14/odbcinstQ/Makefile.am
---- unixODBC-2.2.14.orig/odbcinstQ/Makefile.am	2008-06-30 09:21:04.000000000 -0400
-+++ unixODBC-2.2.14/odbcinstQ/Makefile.am	2009-02-16 12:00:29.000000000 -0500
-@@ -1,6 +1,6 @@
- libodbcinstQ_la_LDFLAGS = \
- 		-no-undefined \
--        -version-info 1:0:0 \
-+        -version-info $(LIB_VERSION) \
- 		-export-dynamic \
- 		-export-symbols @srcdir@/odbcinstQ.exp \
- 	    -module
-diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/Makefile.am unixODBC-2.2.14/odbcinstQ4/Makefile.am
---- unixODBC-2.2.14.orig/odbcinstQ4/Makefile.am	2008-11-18 08:32:58.000000000 -0500
-+++ unixODBC-2.2.14/odbcinstQ4/Makefile.am	2009-02-16 12:00:36.000000000 -0500
-@@ -1,6 +1,6 @@
- libodbcinstQ4_la_LDFLAGS = \
- 		-no-undefined \
--		-version-info 1:0:0 \
-+		-version-info $(LIB_VERSION) \
- 		-export-dynamic \
- 		-export-symbols @srcdir@/odbcinstQ4.exp \
- 		-module
diff --git a/sources b/sources
index 1f136e9..0fc98ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f47c2efb28618ecf5f33319140a7acd0  unixODBC-2.2.14.tar.gz
+86788d4006620fa1f171c13d07fdcaab  unixODBC-2.3.1.tar.gz
diff --git a/unixODBC.spec b/unixODBC.spec
index 0f016b0..47bfab6 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
-Version: 2.2.14
-Release: 13%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -9,25 +9,19 @@ License: GPLv2+ and LGPLv2+
 
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
 Source1: odbcinst.ini
-Source2: ODBCConfig.desktop
 Source4: conffile.h
+Source5: README.fedora
 
 Patch1: depcomp.patch
-Patch2: multilib-config.patch
-Patch3: warning-cleanup.patch
 Patch6: export-symbols.patch
-Patch7: libtool-config.patch
 Patch8: so-version-bump.patch
 Patch9: keep-typedefs.patch
-Patch10: odbcint64-config.patch
-Patch11: enable-items.patch
-Patch12: isql-fixes.patch
 
 Conflicts: iodbc
-BuildRequires: libX11-devel libXt-devel libXext-devel
-BuildRequires: qt4-devel qt-assistant-adp-devel readline-devel
+
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
-BuildRequires: desktop-file-utils
+BuildRequires: readline-devel
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -38,34 +32,19 @@ a MySQL database, and/or the postgresql-odbc package for PostgreSQL.
 %package devel
 Summary: Development files for programs which will use the unixODBC library
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The unixODBC package can be used to access databases through ODBC
 drivers. If you want to develop programs that will access data through
 ODBC, you need to install this package.
 
-%package kde
-Summary: KDE driver manager components for ODBC
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description kde
-This package contains components for the ODBCConfig
-(KDE) component of unixODBC.
-
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 chmod 0644 Drivers/MiniSQL/*.c
 chmod 0644 Drivers/nn/*.c
@@ -81,10 +60,6 @@ rm -rf config.guess config.sub install-sh ltmain.sh libltdl
 libtoolize --install || libtoolize
 
 %build
-# pick up qt path
-export PATH="%{_qt4_bindir}:$PATH"
-# clean up old moc files
-(cd odbcinstQ4 && rm -f mC*.cpp)
 
 aclocal
 automake --add-missing
@@ -95,30 +70,20 @@ CFLAGS="%{optflags} -fno-strict-aliasing"
 CXXFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS
 
-%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-drivers --enable-ltdllib --with-qt-programs="%{_qt4_bindir}" --with-qt-libraries="%{_qt4_libdir}"
+%configure --with-gnu-ld=yes --enable-threads=yes \
+	--enable-drivers=yes --enable-driverc=yes --enable-ltdllib
 make all
 
 %install
-# pick up qt path
-export PATH="%{_qt4_bindir}:$PATH"
-
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
-# install *.desktop files
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-
-# package doesn't supply an icon for ODBCConfig, so use the one for DataManager
-cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
 # multilib header hacks
 # we only apply this to known Red Hat multilib arches, per bug #181335
 case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
+  i386 | x86_64 | ia64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
     mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
     rm -f unixodbc_conf.h
     sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
@@ -128,6 +93,9 @@ case `uname -i` in
     ;;
 esac
 
+# add some explanatory documentation
+cp %{SOURCE5} README.fedora
+
 # remove obsolete Postgres drivers from the package (but not the setup code)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
 
@@ -147,9 +115,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*
 rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool
 
-# initialize lists of .so files; note that libodbcinstQ* go into kde subpkg
-find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" | grep -v /libodbcinstQ > base-so-list
-find $RPM_BUILD_ROOT%{_libdir} -name "*.so"   | sed "s|^$RPM_BUILD_ROOT||" | grep -v /libodbcinstQ > devel-so-list
+# initialize lists of .so files
+find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > base-so-list
+find $RPM_BUILD_ROOT%{_libdir} -name "*.so"   | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list
 
 # move these to main package, they're often dlopened...
 for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so
@@ -165,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f base-so-list
 %defattr(-,root,root)
 %doc README COPYING AUTHORS ChangeLog NEWS doc
+%doc README.fedora
 %config(noreplace) %{_sysconfdir}/odbc*
 %{_bindir}/odbcinst
 %{_bindir}/isql
@@ -176,21 +145,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_includedir}/*
 
-%files kde
-%defattr(-,root,root)
-%{_bindir}/ODBCConfig
-%{_datadir}/applications/ODBCConfig.desktop
-%{_datadir}/pixmaps/LinuxODBC.xpm
-%{_libdir}/libodbcinstQ*so
-%{_libdir}/libodbcinstQ*so.*
-
-%post kde -p /sbin/ldconfig
-%postun kde -p /sbin/ldconfig
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Jan 10 2012 Tom Lane <tgl@redhat.com> 2.3.1-1
+- Update to version 2.3.1.  The main externally-visible change is that the
+  GUI programs are not part of the unixODBC tarball anymore, so they are no
+  longer in this package, and the unixODBC-kde sub-RPM has disappeared.
+  There is a separate package unixODBC-gui-qt that now provides those programs.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/warning-cleanup.patch b/warning-cleanup.patch
deleted file mode 100644
index 8f80eaf..0000000
--- a/warning-cleanup.patch
+++ /dev/null
@@ -1,1713 +0,0 @@
-This patch fixes a boatload of bugs in 2.2.14, some but not all of which
-would manifest only on 64-bit platforms.  All changes were identified by
-examining compiler warnings on a Fedora 9 64-bit build.
-Submitted upstream 2009-02-16.
-
-
-diff -Naur unixODBC-2.2.14.orig/DataManager/classISQL.cpp unixODBC-2.2.14/DataManager/classISQL.cpp
---- unixODBC-2.2.14.orig/DataManager/classISQL.cpp	2007-02-12 06:49:33.000000000 -0500
-+++ unixODBC-2.2.14/DataManager/classISQL.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -180,7 +180,7 @@
-     txtSQL->hide();
- 
-     txtResults->append( qsHorizSep );
--    qsHorizSep.sprintf( "\n\n%d rows affected", nRowsAffected );
-+    qsHorizSep.sprintf( "\n\n%ld rows affected", (long) nRowsAffected );
-     txtResults->append( qsHorizSep );
- 
-     txtResults->setAutoUpdate( TRUE );
-diff -Naur unixODBC-2.2.14.orig/DataManagerII/classBrowse.cpp unixODBC-2.2.14/DataManagerII/classBrowse.cpp
---- unixODBC-2.2.14.orig/DataManagerII/classBrowse.cpp	2007-02-12 06:49:33.000000000 -0500
-+++ unixODBC-2.2.14/DataManagerII/classBrowse.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -243,7 +243,7 @@
-   if (SQL_SUCCEEDED(nReturn))
-     addStatus( QString().sprintf("%s: %d row(s) completed", shortDesc.upper().ascii(), nRowsAffected) ) ;
-   else
--    addStatus( QString().sprintf("%s: %d row(s), ERROR rc=%d, %d row(s) affected", shortDesc.upper().ascii(), listRows.count(), nReturn, nRowsAffected) ) ;
-+    addStatus( QString().sprintf("%s: %ld row(s), ERROR rc=%d, %ld row(s) affected", shortDesc.upper().ascii(), (long) listRows.count(), nReturn, (long) nRowsAffected) ) ;
- 
-   return nRowsAffected ;
- }
-@@ -293,7 +293,7 @@
-     return ;
- 
-   // Confirm delete with user
--  if (!OkWithUser( "table row delete", QString().sprintf("Do you want to delete the following %d row(s)?\nROWS: ", listRows.count()) + qsRowsSelected ))
-+  if (!OkWithUser( "table row delete", QString().sprintf("Do you want to delete the following %ld row(s)?\nROWS: ", (long) listRows.count()) + qsRowsSelected ))
-     return ;
- 
-   // Double check the action to be sure user knows about duplicates that might be affected
-@@ -327,7 +327,7 @@
-     return ;
- 
-   // Confirm delete with user
--  if (!OkWithUser( "table row insert", QString().sprintf("Do you want to insert the following %d row(s)?\nROWS: ", listRows.count()) + qsRowsSelected ))
-+  if (!OkWithUser( "table row insert", QString().sprintf("Do you want to insert the following %ld row(s)?\nROWS: ", (long) listRows.count()) + qsRowsSelected ))
-     return ;
- 
-   // Build SQL statement with parameter markers
-@@ -556,7 +556,7 @@
-     tableData->setNumRows( nRows );
- 
-     // Update the status
--    addStatus( QString().sprintf( "RUN: %d rows and %d columns affected", nRows, nColumns ) ) ;
-+    addStatus( QString().sprintf( "RUN: %ld rows and %d columns affected", (long) nRows, nColumns ) ) ;
- }
- 
- void classBrowse::ExecHeader( SQLHSTMT hStmt, SWORD nColumns )
-diff -Naur unixODBC-2.2.14.orig/DataManagerII/classISQL.cpp unixODBC-2.2.14/DataManagerII/classISQL.cpp
---- unixODBC-2.2.14.orig/DataManagerII/classISQL.cpp	2007-04-17 11:16:14.000000000 -0400
-+++ unixODBC-2.2.14/DataManagerII/classISQL.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -322,7 +322,7 @@
-     txtSQL->hide();
-     txtResults->setAutoUpdate( TRUE );
-     txtResults->repaint();
--    addStatus( QString().sprintf( "RUN: %d rows and %d columns affected", nRowsAffected, nColumns ) ) ;
-+    addStatus( QString().sprintf( "RUN: %ld rows and %d columns affected", (long) nRowsAffected, nColumns ) ) ;
- }
- 
- #ifdef QT_V4LAYOUT
-diff -Naur unixODBC-2.2.14.orig/DriverManager/SQLColAttributesW.c unixODBC-2.2.14/DriverManager/SQLColAttributesW.c
---- unixODBC-2.2.14.orig/DriverManager/SQLColAttributesW.c	2008-09-01 12:38:34.000000000 -0400
-+++ unixODBC-2.2.14/DriverManager/SQLColAttributesW.c	2009-02-15 18:34:44.000000000 -0500
-@@ -368,7 +368,7 @@
-         {
-             if ( CHECK_SQLCOLATTRIBUTE( statement -> connection ))
-             {
--                SQLCHAR *as1;
-+                SQLCHAR *as1 = NULL;
- 
-                 /*
-                  * map to the ODBC3 function
-@@ -460,7 +460,7 @@
-         }
-         else
-         {
--            SQLCHAR *as1;
-+            SQLCHAR *as1 = NULL;
- 
-             switch( field_identifier )
-             {
-diff -Naur unixODBC-2.2.14.orig/DriverManager/SQLConnect.c unixODBC-2.2.14/DriverManager/SQLConnect.c
---- unixODBC-2.2.14.orig/DriverManager/SQLConnect.c	2008-09-29 10:02:43.000000000 -0400
-+++ unixODBC-2.2.14/DriverManager/SQLConnect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -827,7 +827,7 @@
-     return hand;
- }
- 
--static odbc_dlclose( void *handle )
-+static void odbc_dlclose( void *handle )
- {
-     struct lib_count *list, *prev;
- 
-diff -Naur unixODBC-2.2.14.orig/DriverManager/SQLCopyDesc.c unixODBC-2.2.14/DriverManager/SQLCopyDesc.c
---- unixODBC-2.2.14.orig/DriverManager/SQLCopyDesc.c	2004-03-30 08:20:11.000000000 -0500
-+++ unixODBC-2.2.14/DriverManager/SQLCopyDesc.c	2009-02-15 18:34:44.000000000 -0500
-@@ -279,7 +279,7 @@
-          * get the count from the source field
-          */
- 
--        ret == SQLGETDESCFIELD( src_descriptor -> connection,
-+        ret = SQLGETDESCFIELD( src_descriptor -> connection,
-                                 src_descriptor -> driver_desc,
-                                 0, 
-                                 SQL_DESC_COUNT,
-@@ -298,7 +298,7 @@
-             {
-                 if ( header_fields[ i ].field_type == SQL_INTEGER )
-                 {
--                    ret == SQLGETDESCFIELD( src_descriptor -> connection,
-+                    ret = SQLGETDESCFIELD( src_descriptor -> connection,
-                                 src_descriptor -> driver_desc,
-                                 0, 
-                                 header_fields[ i ].field_identifier,
-@@ -308,7 +308,7 @@
-                 }
-                 else if ( header_fields[ i ].field_type == SQL_SMALLINT )
-                 {
--                    ret == SQLGETDESCFIELD( src_descriptor -> connection,
-+                    ret = SQLGETDESCFIELD( src_descriptor -> connection,
-                                 src_descriptor -> driver_desc,
-                                 0, 
-                                 header_fields[ i ].field_identifier,
-@@ -318,7 +318,7 @@
-                 }
-                 if ( header_fields[ i ].field_type == SQL_VARCHAR )
-                 {
--                    ret == SQLGETDESCFIELD( src_descriptor -> connection,
-+                    ret = SQLGETDESCFIELD( src_descriptor -> connection,
-                                 src_descriptor -> driver_desc,
-                                 0, 
-                                 header_fields[ i ].field_identifier,
-@@ -331,7 +331,7 @@
-                 {
-                     if ( header_fields[ i ].field_type == SQL_INTEGER )
-                     {
--                        ret == SQLSETDESCFIELD( target_descriptor -> connection,
-+                        ret = SQLSETDESCFIELD( target_descriptor -> connection,
-                                         target_descriptor -> driver_desc,
-                                         0, 
-                                         header_fields[ i ].field_identifier,
-@@ -340,7 +340,7 @@
-                     }
-                     else if ( header_fields[ i ].field_type == SQL_SMALLINT )
-                     {
--                        ret == SQLSETDESCFIELD( target_descriptor -> connection,
-+                        ret = SQLSETDESCFIELD( target_descriptor -> connection,
-                                         target_descriptor -> driver_desc,
-                                         0, 
-                                         header_fields[ i ].field_identifier,
-@@ -349,7 +349,7 @@
-                     }
-                     else if ( header_fields[ i ].field_type == SQL_VARCHAR )
-                     {
--                        ret == SQLSETDESCFIELD( target_descriptor -> connection,
-+                        ret = SQLSETDESCFIELD( target_descriptor -> connection,
-                                         target_descriptor -> driver_desc,
-                                         0, 
-                                         header_fields[ i ].field_identifier,
-@@ -376,7 +376,7 @@
-                 {
-                     if ( rec_fields[ i ].field_type == SQL_INTEGER )
-                     {
--                        ret == SQLGETDESCFIELD( src_descriptor -> connection,
-+                        ret = SQLGETDESCFIELD( src_descriptor -> connection,
-                                     src_descriptor -> driver_desc,
-                                     rec, 
-                                     rec_fields[ i ].field_identifier,
-@@ -386,7 +386,7 @@
-                     }
-                     else if ( rec_fields[ i ].field_type == SQL_SMALLINT )
-                     {
--                        ret == SQLGETDESCFIELD( src_descriptor -> connection,
-+                        ret = SQLGETDESCFIELD( src_descriptor -> connection,
-                                     src_descriptor -> driver_desc,
-                                     rec, 
-                                     rec_fields[ i ].field_identifier,
-@@ -396,7 +396,7 @@
-                     }
-                     if ( rec_fields[ i ].field_type == SQL_VARCHAR )
-                     {
--                        ret == SQLGETDESCFIELD( src_descriptor -> connection,
-+                        ret = SQLGETDESCFIELD( src_descriptor -> connection,
-                                     src_descriptor -> driver_desc,
-                                     rec, 
-                                     rec_fields[ i ].field_identifier,
-@@ -409,7 +409,7 @@
-                     {
-                         if ( rec_fields[ i ].field_type == SQL_INTEGER )
-                         {
--                            ret == SQLSETDESCFIELD( target_descriptor -> connection,
-+                            ret = SQLSETDESCFIELD( target_descriptor -> connection,
-                                             target_descriptor -> driver_desc,
-                                             rec, 
-                                             rec_fields[ i ].field_identifier,
-@@ -418,7 +418,7 @@
-                         }
-                         else if ( rec_fields[ i ].field_type == SQL_SMALLINT )
-                         {
--                            ret == SQLSETDESCFIELD( target_descriptor -> connection,
-+                            ret = SQLSETDESCFIELD( target_descriptor -> connection,
-                                             target_descriptor -> driver_desc,
-                                             rec, 
-                                             rec_fields[ i ].field_identifier,
-@@ -427,7 +427,7 @@
-                         }
-                         else if ( rec_fields[ i ].field_type == SQL_VARCHAR )
-                         {
--                            ret == SQLSETDESCFIELD( target_descriptor -> connection,
-+                            ret = SQLSETDESCFIELD( target_descriptor -> connection,
-                                             target_descriptor -> driver_desc,
-                                             rec, 
-                                             rec_fields[ i ].field_identifier,
-diff -Naur unixODBC-2.2.14.orig/DriverManager/SQLDriverConnect.c unixODBC-2.2.14/DriverManager/SQLDriverConnect.c
---- unixODBC-2.2.14.orig/DriverManager/SQLDriverConnect.c	2008-09-29 10:02:44.000000000 -0400
-+++ unixODBC-2.2.14/DriverManager/SQLDriverConnect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -366,7 +366,8 @@
-     memcpy( *keyword, ptr, len );
-     (*keyword)[ len ] = '\0';
- 
--    (**cp != ';') && (*cp)++;
-+    if (**cp != ';')
-+      (*cp)++;
-     ptr = *cp;
- 
-     if ( strcmp( *keyword, "DRIVER" ) == 0 )
-diff -Naur unixODBC-2.2.14.orig/DriverManager/SQLDriversW.c unixODBC-2.2.14/DriverManager/SQLDriversW.c
---- unixODBC-2.2.14.orig/DriverManager/SQLDriversW.c	2008-09-29 10:02:45.000000000 -0400
-+++ unixODBC-2.2.14/DriverManager/SQLDriversW.c	2009-02-15 18:34:44.000000000 -0500
-@@ -298,7 +298,7 @@
-              * enumerate the driver attributes
-              */
- 
--            sprintf( szIniName, "%s/odbcinst.ini", odbcinst_system_file_path( b1 ), odbcinst_system_file_name( b2 ));
-+            sprintf( szIniName, "%s/odbcinst.ini", odbcinst_system_file_path( b1 ) );
- 
- 			memset( buffer, '\0', sizeof( buffer ));
- #ifdef __OS2__
-diff -Naur unixODBC-2.2.14.orig/DriverManager/SQLGetDiagField.c unixODBC-2.2.14/DriverManager/SQLGetDiagField.c
---- unixODBC-2.2.14.orig/DriverManager/SQLGetDiagField.c	2008-09-29 10:02:45.000000000 -0400
-+++ unixODBC-2.2.14/DriverManager/SQLGetDiagField.c	2009-02-15 18:34:44.000000000 -0500
-@@ -314,7 +314,7 @@
-             else if ( __get_connection( head ) -> unicode_driver &&
-                 CHECK_SQLGETDIAGFIELDW( __get_connection( head )))
-             {
--                SQLWCHAR *s1;
-+                SQLWCHAR *s1 = NULL;
- 
-                 if ( buffer_length > 0 )
-                 {
-diff -Naur unixODBC-2.2.14.orig/DriverManager/SQLSetPos.c unixODBC-2.2.14/DriverManager/SQLSetPos.c
---- unixODBC-2.2.14.orig/DriverManager/SQLSetPos.c	2003-10-30 13:20:46.000000000 -0500
-+++ unixODBC-2.2.14/DriverManager/SQLSetPos.c	2009-02-15 18:34:44.000000000 -0500
-@@ -144,11 +144,11 @@
-     {
-         sprintf( statement -> msg, "\n\t\tEntry:\
-             \n\t\t\tStatement = %p\
--            \n\t\t\tIrow = %d\
-+            \n\t\t\tIrow = %ld\
-             \n\t\t\tFoption = %d\
-             \n\t\t\tFlock = %d",
-                 statement,
--                irow,
-+                (long) irow,
-                 foption,
-                 flock );
- 
-diff -Naur unixODBC-2.2.14.orig/DriverManager/__attribute.c unixODBC-2.2.14/DriverManager/__attribute.c
---- unixODBC-2.2.14.orig/DriverManager/__attribute.c	2008-10-17 05:23:51.000000000 -0400
-+++ unixODBC-2.2.14/DriverManager/__attribute.c	2009-02-15 18:34:44.000000000 -0500
-@@ -1227,6 +1227,7 @@
- 
-       default:
-         as = NULL;
-+        msg = NULL;
-         break;
-     }
- 
-@@ -1288,6 +1289,7 @@
- 
-       default:
-         as = NULL;
-+        msg = NULL;
-         break;
-     }
- 
-diff -Naur unixODBC-2.2.14.orig/DriverManager/__info.c unixODBC-2.2.14/DriverManager/__info.c
---- unixODBC-2.2.14.orig/DriverManager/__info.c	2008-09-29 10:02:45.000000000 -0400
-+++ unixODBC-2.2.14/DriverManager/__info.c	2009-02-15 18:34:44.000000000 -0500
-@@ -3062,13 +3062,13 @@
-     {
-         if ( strlen((char*) instr ) > LOG_MESSAGE_LEN )
-         {
--            sprintf((char*) ostr, "[%.*s...][length = %d (SQL_NTS)]",
--                LOG_MESSAGE_LEN, instr, strlen((char*) instr ));
-+            sprintf((char*) ostr, "[%.*s...][length = %ld (SQL_NTS)]",
-+                LOG_MESSAGE_LEN, instr, (long) strlen((char*) instr ));
-         }
-         else
-         {
--            sprintf((char*) ostr, "[%s][length = %d (SQL_NTS)]",
--                instr, strlen((char*) instr ));
-+            sprintf((char*) ostr, "[%s][length = %ld (SQL_NTS)]",
-+                instr, (long) strlen((char*) instr ));
-         }
- 
-     }
-diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/dlg_specific.c unixODBC-2.2.14/Drivers/Postgre7.1/dlg_specific.c
---- unixODBC-2.2.14.orig/Drivers/Postgre7.1/dlg_specific.c	2001-12-04 11:46:19.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/Postgre7.1/dlg_specific.c	2009-02-15 18:34:43.000000000 -0500
-@@ -21,10 +21,11 @@
- #endif
- 
- #ifndef WIN32
-+# include <string.h>
-+# include <ctype.h>
- # ifdef UNIXODBC
- #  include <odbcinst.h>
- # else
--#  include <string.h>
- #  include "gpps.h"
- #  define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
- #  define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
-diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/options.c unixODBC-2.2.14/Drivers/Postgre7.1/options.c
---- unixODBC-2.2.14.orig/Drivers/Postgre7.1/options.c	2005-09-12 09:09:41.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/Postgre7.1/options.c	2009-02-15 18:34:43.000000000 -0500
-@@ -221,12 +221,12 @@
- 
- 		if (stmt) {
- 			SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR, "Unknown statement option (Set)");
--			sprintf(option, "fOption=%d, vParam=%ld", fOption, vParam);
-+			sprintf(option, "fOption=%d, vParam=%ld", fOption, (long) vParam);
- 			SC_log_error(func, option, stmt);
- 		}
- 		if (conn) {
- 			CC_set_error(conn, STMT_NOT_IMPLEMENTED_ERROR, "Unknown statement option (Set)");
--			sprintf(option, "fOption=%d, vParam=%ld", fOption, vParam);
-+			sprintf(option, "fOption=%d, vParam=%ld", fOption, (long) vParam);
- 			CC_log_error(func, option, conn);
- 		}
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/socket.c unixODBC-2.2.14/Drivers/Postgre7.1/socket.c
---- unixODBC-2.2.14.orig/Drivers/Postgre7.1/socket.c	2004-09-22 05:13:39.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/Postgre7.1/socket.c	2009-02-15 18:34:43.000000000 -0500
-@@ -188,7 +188,7 @@
- /*
-  * cope with different path for debian distrib
-  */
--
-+int
- SOCK_connect_to_unix(SocketClass *self, unsigned short port, char *path )
-     {
-     if ( strlen( path ) > 0 )
-diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/tuple.c unixODBC-2.2.14/Drivers/Postgre7.1/tuple.c
---- unixODBC-2.2.14.orig/Drivers/Postgre7.1/tuple.c	2001-10-17 12:40:10.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/Postgre7.1/tuple.c	2009-02-15 18:34:43.000000000 -0500
-@@ -49,7 +49,7 @@
- {
- char buffer[15];
- 
--	sprintf(buffer,"%ld", value);
-+	sprintf(buffer,"%ld", (long) value);
- 
- 	tuple_field->len = strlen(buffer)+1;
- 	/* +1 ... is this correct (better be on the save side-...) */
-diff -Naur unixODBC-2.2.14.orig/Drivers/PostgreSQL/options.c unixODBC-2.2.14/Drivers/PostgreSQL/options.c
---- unixODBC-2.2.14.orig/Drivers/PostgreSQL/options.c	2005-09-12 09:09:41.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/PostgreSQL/options.c	2009-02-15 18:34:43.000000000 -0500
-@@ -232,13 +232,13 @@
- 		if (stmt) {
- 			stmt->errornumber = STMT_NOT_IMPLEMENTED_ERROR;
- 			stmt->errormsg = "Unknown statement option (Set)";
--			sprintf(option, "fOption=%d, vParam=%ld", fOption, vParam);
-+			sprintf(option, "fOption=%d, vParam=%ld", fOption, (long) vParam);
- 			SC_log_error(func, option, stmt);
- 		}
- 		if (conn) {
- 			conn->errornumber = STMT_NOT_IMPLEMENTED_ERROR;
- 			conn->errormsg = "Unknown statement option (Set)";
--			sprintf(option, "fOption=%d, vParam=%ld", fOption, vParam);
-+			sprintf(option, "fOption=%d, vParam=%ld", fOption, (long) vParam);
- 			CC_log_error(func, option, conn);
- 		}
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/PostgreSQL/socket.c unixODBC-2.2.14/Drivers/PostgreSQL/socket.c
---- unixODBC-2.2.14.orig/Drivers/PostgreSQL/socket.c	2003-02-18 13:46:49.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/PostgreSQL/socket.c	2009-02-15 18:34:43.000000000 -0500
-@@ -191,7 +191,7 @@
- /*
-  * cope with different path for debian distrib
-  */
--
-+int
- SOCK_connect_to_unix(SocketClass *self, unsigned short port, char *path )
-     {
-     if ( strlen( path ) > 0 )
-diff -Naur unixODBC-2.2.14.orig/Drivers/PostgreSQL/tuple.c unixODBC-2.2.14/Drivers/PostgreSQL/tuple.c
---- unixODBC-2.2.14.orig/Drivers/PostgreSQL/tuple.c	2001-10-17 12:40:11.000000000 -0400
-+++ unixODBC-2.2.14/Drivers/PostgreSQL/tuple.c	2009-02-15 18:34:43.000000000 -0500
-@@ -49,7 +49,7 @@
- {
- char buffer[15];
- 
--	sprintf(buffer,"%ld", value);
-+	sprintf(buffer,"%ld", (long) value);
- 
- 	tuple_field->len = strlen(buffer)+1;
- 	/* +1 ... is this correct (better be on the save side-...) */
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLAllocConnect.c unixODBC-2.2.14/Drivers/template/SQLAllocConnect.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLAllocConnect.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLAllocConnect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -26,7 +26,7 @@
-     if( SQL_NULL_HENV == hEnv )
-         return SQL_INVALID_HANDLE;
- 
--    sprintf((char*) hEnv->szSqlMsg, "hEnv = $%08lX phDbc = $%08lX",	hEnv, phDbc );
-+    sprintf((char*) hEnv->szSqlMsg, "hEnv = $%08lX phDbc = $%08lX",	(long) hEnv, (long) phDbc );
-     logPushMsg( hEnv->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hEnv->szSqlMsg );
- 
-     if( SQL_NULL_HDBC == phDbc )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLAllocStmt.c unixODBC-2.2.14/Drivers/template/SQLAllocStmt.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLAllocStmt.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLAllocStmt.c	2009-02-15 18:34:44.000000000 -0500
-@@ -25,7 +25,7 @@
-         return SQL_INVALID_HANDLE;
-     }
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
-     if( NULL == phStmt )
-@@ -45,7 +45,7 @@
-     }
- 
-     /* initialize memory */
--	sprintf((char*) hDbc->szSqlMsg, "*phstmt = $%08lX", *phStmt );
-+	sprintf((char*) hDbc->szSqlMsg, "*phstmt = $%08lX", (long) *phStmt );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
- 	memset( *phStmt, 0, sizeof(DRVSTMT) );	/* SAFETY */
-@@ -55,7 +55,7 @@
-     (*phStmt)->pNext		= NULL;
-     (*phStmt)->pPrev		= NULL;
-     (*phStmt)->pszQuery		= NULL;
--    sprintf((char*)(*phStmt)->szCursorName, "CUR_%08lX", *phStmt );
-+    sprintf((char*)(*phStmt)->szCursorName, "CUR_%08lX", (long) *phStmt );
- 
- 	/* ADD TO DBCs STATEMENT LIST */
- 	
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLBindCol.c unixODBC-2.2.14/Drivers/template/SQLBindCol.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLBindCol.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLBindCol.c	2009-02-15 18:34:44.000000000 -0500
-@@ -26,7 +26,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt=$%08lX nCol=%5d", hStmt, nCol );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt=$%08lX nCol=%5d", (long) hStmt, nCol );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_INFO, LOG_INFO,(char*) hStmt->szSqlMsg );
- 
- 	if ( hStmt->hStmtExtras->nRows == 0 )
-@@ -37,7 +37,7 @@
- 
- 	if ( nCol < 1 || nCol > hStmt->hStmtExtras->nCols )
- 	{
--		sprintf((char*) hStmt->szSqlMsg, "SQL_ERROR Column %d is out of range. Range is 1 - %s", nCol, hStmt->hStmtExtras->nCols );
-+		sprintf((char*) hStmt->szSqlMsg, "SQL_ERROR Column %d is out of range. Range is 1 - %d", nCol, hStmt->hStmtExtras->nCols );
- 		logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 		return SQL_ERROR;
- 	}
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLBindParameter.c unixODBC-2.2.14/Drivers/template/SQLBindParameter.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLBindParameter.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLBindParameter.c	2009-02-15 18:34:43.000000000 -0500
-@@ -30,7 +30,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt=$%08lX nParameterNumber=%d nIOType=%d nBufferType=%d nParamType=%d nParamLength=%d nScale=%d pData=$%08lX nBufferLength=%d *pnLengthOrIndicator=$%08lX",hStmt,nParameterNumber,nIOType,nBufferType,nParamType,nParamLength,nScale,pData,nBufferLength, *pnLengthOrIndicator );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt=$%08lX nParameterNumber=%d nIOType=%d nBufferType=%d nParamType=%d nParamLength=%ld nScale=%d pData=$%08lX nBufferLength=%ld *pnLengthOrIndicator=$%08lX",(long) hStmt,nParameterNumber,nIOType,nBufferType,nParamType,(long) nParamLength,nScale,(long) pData,(long) nBufferLength, *pnLengthOrIndicator );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLBrowseConnect.c unixODBC-2.2.14/Drivers/template/SQLBrowseConnect.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLBrowseConnect.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLBrowseConnect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -26,7 +26,7 @@
- 	if ( hDbc == NULL )
- 		return SQL_INVALID_HANDLE;
- 	
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
- 	logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING, "SQL_ERROR This function not currently supported" );
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLBulkOperations.c unixODBC-2.2.14/Drivers/template/SQLBulkOperations.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLBulkOperations.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLBulkOperations.c	2009-02-15 18:34:44.000000000 -0500
-@@ -21,7 +21,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /* OK */
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLCancel.c unixODBC-2.2.14/Drivers/template/SQLCancel.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLCancel.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLCancel.c	2009-02-15 18:34:44.000000000 -0500
-@@ -20,7 +20,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLCloseCursor.c unixODBC-2.2.14/Drivers/template/SQLCloseCursor.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLCloseCursor.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLCloseCursor.c	2009-02-15 18:34:44.000000000 -0500
-@@ -20,7 +20,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--    sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+    sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	/************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLColAttributes.c unixODBC-2.2.14/Drivers/template/SQLColAttributes.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLColAttributes.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLColAttributes.c	2009-02-15 18:34:44.000000000 -0500
-@@ -27,7 +27,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /**************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLColumnPrivileges.c unixODBC-2.2.14/Drivers/template/SQLColumnPrivileges.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLColumnPrivileges.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLColumnPrivileges.c	2009-02-15 18:34:44.000000000 -0500
-@@ -28,7 +28,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLColumns.c unixODBC-2.2.14/Drivers/template/SQLColumns.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLColumns.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLColumns.c	2009-02-15 18:34:44.000000000 -0500
-@@ -76,7 +76,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( szTableName == NULL || szTableName[0] == '\0' )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLConnect.c unixODBC-2.2.14/Drivers/template/SQLConnect.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLConnect.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLConnect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -31,7 +31,7 @@
-     if( SQL_NULL_HDBC == hDbc )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc=$%08lX 3zDataSource=(%s)", hDbc, szDataSource );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc=$%08lX 3zDataSource=(%s)", (long) hDbc, szDataSource );
- 	logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
-     if( hDbc->bConnected == 1 )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLDescribeCol.c unixODBC-2.2.14/Drivers/template/SQLDescribeCol.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLDescribeCol.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLDescribeCol.c	2009-02-15 18:34:44.000000000 -0500
-@@ -38,7 +38,7 @@
- 	}
- 	if ( nCol < 1 || nCol > hStmt->hStmtExtras->nCols )
- 	{
--		sprintf((char*) hStmt->szSqlMsg, "SQL_ERROR Column %d is out of range. Range is 1 - %s", nCol, hStmt->hStmtExtras->nCols );
-+		sprintf((char*) hStmt->szSqlMsg, "SQL_ERROR Column %d is out of range. Range is 1 - %d", nCol, hStmt->hStmtExtras->nCols );
- 		logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 		return SQL_ERROR;
- 	}
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLDescribeParam.c unixODBC-2.2.14/Drivers/template/SQLDescribeParam.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLDescribeParam.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLDescribeParam.c	2009-02-15 18:34:44.000000000 -0500
-@@ -33,7 +33,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLDisconnect.c unixODBC-2.2.14/Drivers/template/SQLDisconnect.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLDisconnect.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLDisconnect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -20,7 +20,7 @@
-     if( NULL == hDbc )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING, (char*)hDbc->szSqlMsg );
- 
-     if( hDbc->bConnected == 0 )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLDriverConnect.c unixODBC-2.2.14/Drivers/template/SQLDriverConnect.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLDriverConnect.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLDriverConnect.c	2009-02-15 18:34:43.000000000 -0500
-@@ -41,7 +41,7 @@
-     if( NULL == hDbc )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLExecDirect.c unixODBC-2.2.14/Drivers/template/SQLExecDirect.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLExecDirect.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLExecDirect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -23,7 +23,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	/* prepare command */
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLExecute.c unixODBC-2.2.14/Drivers/template/SQLExecute.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLExecute.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLExecute.c	2009-02-15 18:34:43.000000000 -0500
-@@ -24,7 +24,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     if( hStmt->pszQuery == NULL )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLExtendedFetch.c unixODBC-2.2.14/Drivers/template/SQLExtendedFetch.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLExtendedFetch.c	2007-11-29 07:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLExtendedFetch.c	2009-02-15 18:34:44.000000000 -0500
-@@ -24,7 +24,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLFetch.c unixODBC-2.2.14/Drivers/template/SQLFetch.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLFetch.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLFetch.c	2009-02-15 18:34:44.000000000 -0500
-@@ -22,7 +22,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( hStmt->hStmtExtras->nRows < 1 )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLFetchScroll.c unixODBC-2.2.14/Drivers/template/SQLFetchScroll.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLFetchScroll.c	2007-11-29 07:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLFetchScroll.c	2009-02-15 18:34:44.000000000 -0500
-@@ -22,7 +22,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLForeignKeys.c unixODBC-2.2.14/Drivers/template/SQLForeignKeys.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLForeignKeys.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLForeignKeys.c	2009-02-15 18:34:43.000000000 -0500
-@@ -32,7 +32,7 @@
-     if( NULL == hStmt )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLFreeConnect.c unixODBC-2.2.14/Drivers/template/SQLFreeConnect.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLFreeConnect.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLFreeConnect.c	2009-02-15 18:34:44.000000000 -0500
-@@ -24,7 +24,7 @@
-     if( NULL == hDbc )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING, (char*)hDbc->szSqlMsg );
- 
-     if( hDbc->bConnected )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLFreeEnv.c unixODBC-2.2.14/Drivers/template/SQLFreeEnv.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLFreeEnv.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLFreeEnv.c	2009-02-15 18:34:44.000000000 -0500
-@@ -23,7 +23,7 @@
-     if( hEnv == SQL_NULL_HENV )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hEnv->szSqlMsg, "hEnv = $%08lX", hEnv );
-+	sprintf((char*) hEnv->szSqlMsg, "hEnv = $%08lX", (long) hEnv );
-     logPushMsg( hEnv->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hEnv->szSqlMsg );
- 
- 	if ( hEnv->hFirstDbc != NULL )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLFreeStmt.c unixODBC-2.2.14/Drivers/template/SQLFreeStmt.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLFreeStmt.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLFreeStmt.c	2009-02-15 18:34:44.000000000 -0500
-@@ -21,7 +21,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /*********
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLGetConnectAttr.c unixODBC-2.2.14/Drivers/template/SQLGetConnectAttr.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLGetConnectAttr.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLGetConnectAttr.c	2009-02-15 18:34:43.000000000 -0500
-@@ -26,7 +26,7 @@
-     if( NULL == hDbc )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLGetConnectOption.c unixODBC-2.2.14/Drivers/template/SQLGetConnectOption.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLGetConnectOption.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLGetConnectOption.c	2009-02-15 18:34:44.000000000 -0500
-@@ -22,7 +22,7 @@
-     if( NULL == hDbc )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
-     logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLGetCursorName.c unixODBC-2.2.14/Drivers/template/SQLGetCursorName.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLGetCursorName.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLGetCursorName.c	2009-02-15 18:34:44.000000000 -0500
-@@ -25,7 +25,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 	
- 	if ( NULL == szCursor )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLGetStmtAttr.c unixODBC-2.2.14/Drivers/template/SQLGetStmtAttr.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLGetStmtAttr.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLGetStmtAttr.c	2009-02-15 18:34:44.000000000 -0500
-@@ -25,7 +25,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLGetStmtOption.c unixODBC-2.2.14/Drivers/template/SQLGetStmtOption.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLGetStmtOption.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLGetStmtOption.c	2009-02-15 18:34:44.000000000 -0500
-@@ -22,7 +22,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLGetTypeInfo.c unixODBC-2.2.14/Drivers/template/SQLGetTypeInfo.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLGetTypeInfo.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLGetTypeInfo.c	2009-02-15 18:34:44.000000000 -0500
-@@ -21,7 +21,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLMoreResults.c unixODBC-2.2.14/Drivers/template/SQLMoreResults.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLMoreResults.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLMoreResults.c	2009-02-15 18:34:44.000000000 -0500
-@@ -20,7 +20,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLNativeSql.c unixODBC-2.2.14/Drivers/template/SQLNativeSql.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLNativeSql.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLNativeSql.c	2009-02-15 18:34:44.000000000 -0500
-@@ -25,7 +25,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLNumParams.c unixODBC-2.2.14/Drivers/template/SQLNumParams.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLNumParams.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLNumParams.c	2009-02-15 18:34:44.000000000 -0500
-@@ -21,7 +21,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLNumResultCols.c unixODBC-2.2.14/Drivers/template/SQLNumResultCols.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLNumResultCols.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLNumResultCols.c	2009-02-15 18:34:44.000000000 -0500
-@@ -21,7 +21,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 	
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( hStmt->hStmtExtras->nRows < 1 )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLParamData.c unixODBC-2.2.14/Drivers/template/SQLParamData.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLParamData.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLParamData.c	2009-02-15 18:34:43.000000000 -0500
-@@ -21,7 +21,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLParamOptions.c unixODBC-2.2.14/Drivers/template/SQLParamOptions.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLParamOptions.c	2007-02-12 06:49:35.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLParamOptions.c	2009-02-15 18:34:44.000000000 -0500
-@@ -22,7 +22,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLPrepare.c unixODBC-2.2.14/Drivers/template/SQLPrepare.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLPrepare.c	2001-12-13 08:00:32.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLPrepare.c	2009-02-15 18:34:43.000000000 -0500
-@@ -22,7 +22,7 @@
- 	if ( NULL == hStmt )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
- 	logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( szSqlStr == NULL )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLPrimaryKeys.c unixODBC-2.2.14/Drivers/template/SQLPrimaryKeys.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLPrimaryKeys.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLPrimaryKeys.c	2009-02-15 18:34:44.000000000 -0500
-@@ -26,7 +26,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLProcedureColumns.c unixODBC-2.2.14/Drivers/template/SQLProcedureColumns.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLProcedureColumns.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLProcedureColumns.c	2009-02-15 18:34:44.000000000 -0500
-@@ -29,7 +29,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLProcedures.c unixODBC-2.2.14/Drivers/template/SQLProcedures.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLProcedures.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLProcedures.c	2009-02-15 18:34:44.000000000 -0500
-@@ -27,7 +27,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLPutData.c unixODBC-2.2.14/Drivers/template/SQLPutData.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLPutData.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLPutData.c	2009-02-15 18:34:44.000000000 -0500
-@@ -25,7 +25,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLRowCount.c unixODBC-2.2.14/Drivers/template/SQLRowCount.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLRowCount.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLRowCount.c	2009-02-15 18:34:44.000000000 -0500
-@@ -21,7 +21,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( NULL == pnRowCount )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLSetCursorName.c unixODBC-2.2.14/Drivers/template/SQLSetCursorName.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLSetCursorName.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLSetCursorName.c	2009-02-15 18:34:44.000000000 -0500
-@@ -22,7 +22,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( NULL == szCursor || 0 == isalpha(*szCursor) )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLSetParam.c unixODBC-2.2.14/Drivers/template/SQLSetParam.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLSetParam.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLSetParam.c	2009-02-15 18:34:44.000000000 -0500
-@@ -24,7 +24,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( NULL == hStmt->pszQuery )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLSetPos.c unixODBC-2.2.14/Drivers/template/SQLSetPos.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLSetPos.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLSetPos.c	2009-02-15 18:34:44.000000000 -0500
-@@ -23,7 +23,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	/* OK */
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLSetScrollOptions.c unixODBC-2.2.14/Drivers/template/SQLSetScrollOptions.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLSetScrollOptions.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLSetScrollOptions.c	2009-02-15 18:34:44.000000000 -0500
-@@ -24,7 +24,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLSetStmtAttr.c unixODBC-2.2.14/Drivers/template/SQLSetStmtAttr.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLSetStmtAttr.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLSetStmtAttr.c	2009-02-15 18:34:44.000000000 -0500
-@@ -24,7 +24,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLSetStmtOption.c unixODBC-2.2.14/Drivers/template/SQLSetStmtOption.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLSetStmtOption.c	2007-11-29 07:00:36.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLSetStmtOption.c	2009-02-15 18:34:44.000000000 -0500
-@@ -22,7 +22,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLSpecialColumns.c unixODBC-2.2.14/Drivers/template/SQLSpecialColumns.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLSpecialColumns.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLSpecialColumns.c	2009-02-15 18:34:44.000000000 -0500
-@@ -41,7 +41,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLStatistics.c unixODBC-2.2.14/Drivers/template/SQLStatistics.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLStatistics.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLStatistics.c	2009-02-15 18:34:44.000000000 -0500
-@@ -62,7 +62,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 	if ( szTableName == NULL )
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLTablePrivileges.c unixODBC-2.2.14/Drivers/template/SQLTablePrivileges.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLTablePrivileges.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLTablePrivileges.c	2009-02-15 18:34:44.000000000 -0500
-@@ -26,7 +26,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
- 
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLTables.c unixODBC-2.2.14/Drivers/template/SQLTables.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLTables.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLTables.c	2009-02-15 18:34:44.000000000 -0500
-@@ -57,7 +57,7 @@
-     if( hStmt == SQL_NULL_HSTMT )
-         return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", hStmt );
-+	sprintf((char*) hStmt->szSqlMsg, "hStmt = $%08lX", (long) hStmt );
-     logPushMsg( hStmt->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hStmt->szSqlMsg );
- 
-     /**************************
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/SQLTransact.c unixODBC-2.2.14/Drivers/template/SQLTransact.c
---- unixODBC-2.2.14.orig/Drivers/template/SQLTransact.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/SQLTransact.c	2009-02-15 18:34:44.000000000 -0500
-@@ -23,7 +23,7 @@
- 	if ( hDbc == SQL_NULL_HDBC )
- 		return SQL_INVALID_HANDLE;
- 
--	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", hDbc );
-+	sprintf((char*) hDbc->szSqlMsg, "hDbc = $%08lX", (long) hDbc );
- 	logPushMsg( hDbc->hLog, __FILE__, __FILE__, __LINE__, LOG_WARNING, LOG_WARNING,(char*) hDbc->szSqlMsg );
- 
- 	
-diff -Naur unixODBC-2.2.14.orig/Drivers/template/_GetData.c unixODBC-2.2.14/Drivers/template/_GetData.c
---- unixODBC-2.2.14.orig/Drivers/template/_GetData.c	2001-12-13 08:00:33.000000000 -0500
-+++ unixODBC-2.2.14/Drivers/template/_GetData.c	2009-02-15 18:34:44.000000000 -0500
-@@ -89,7 +89,7 @@
- 			break;
- 
- 		case SQL_C_FLOAT:
--			sscanf( pSourceData, "%g", pTarget );
-+			sscanf( pSourceData, "%g", (float *) pTarget );
- 			if ( NULL != pnLengthOrIndicator )
- 				*pnLengthOrIndicator = sizeof( float );
- 			break;
-diff -Naur unixODBC-2.2.14.orig/cur/SQLAllocHandle.c unixODBC-2.2.14/cur/SQLAllocHandle.c
---- unixODBC-2.2.14.orig/cur/SQLAllocHandle.c	2005-07-08 08:11:23.000000000 -0400
-+++ unixODBC-2.2.14/cur/SQLAllocHandle.c	2009-02-15 18:34:44.000000000 -0500
-@@ -148,4 +148,6 @@
-            }
-            break;
-     }
-+
-+    return SQL_ERROR;
- }
-diff -Naur unixODBC-2.2.14.orig/cur/SQLEndTran.c unixODBC-2.2.14/cur/SQLEndTran.c
---- unixODBC-2.2.14.orig/cur/SQLEndTran.c	2001-10-17 12:40:15.000000000 -0400
-+++ unixODBC-2.2.14/cur/SQLEndTran.c	2009-02-15 18:34:44.000000000 -0500
-@@ -54,6 +54,7 @@
-         /*
-          * the driver manager will not call this
-          */
-+        return SQL_ERROR;
-         break;
- 
-       case SQL_HANDLE_DBC:
-diff -Naur unixODBC-2.2.14.orig/cur/SQLError.c unixODBC-2.2.14/cur/SQLError.c
---- unixODBC-2.2.14.orig/cur/SQLError.c	2008-01-02 10:10:33.000000000 -0500
-+++ unixODBC-2.2.14/cur/SQLError.c	2009-02-15 18:34:44.000000000 -0500
-@@ -160,4 +160,6 @@
- 
-         return SQL_NO_DATA;
-     }
-+
-+    return SQL_ERROR;
- }
-diff -Naur unixODBC-2.2.14.orig/cur/SQLExtendedFetch.c unixODBC-2.2.14/cur/SQLExtendedFetch.c
---- unixODBC-2.2.14.orig/cur/SQLExtendedFetch.c	2008-01-22 12:51:54.000000000 -0500
-+++ unixODBC-2.2.14/cur/SQLExtendedFetch.c	2009-02-15 18:34:44.000000000 -0500
-@@ -612,7 +612,7 @@
-         }
- 		else if ( ret == SQL_FETCH_PART_ROWSET ) 
- 		{
--        	cl_statement -> rowset_position == CL_AFTER_END;
-+        	cl_statement -> rowset_position = CL_AFTER_END;
- 			ret = SQL_SUCCESS;
- 		}
-         break;
-diff -Naur unixODBC-2.2.14.orig/cur/SQLFreeHandle.c unixODBC-2.2.14/cur/SQLFreeHandle.c
---- unixODBC-2.2.14.orig/cur/SQLFreeHandle.c	2004-07-24 13:55:38.000000000 -0400
-+++ unixODBC-2.2.14/cur/SQLFreeHandle.c	2009-02-15 18:34:44.000000000 -0500
-@@ -122,5 +122,7 @@
-          */
-         return SQL_ERROR;
-     }
-+
-+    return SQL_ERROR;
- }
- 
-diff -Naur unixODBC-2.2.14.orig/cur/SQLGetStmtAttr.c unixODBC-2.2.14/cur/SQLGetStmtAttr.c
---- unixODBC-2.2.14.orig/cur/SQLGetStmtAttr.c	2005-10-27 13:54:49.000000000 -0400
-+++ unixODBC-2.2.14/cur/SQLGetStmtAttr.c	2009-02-15 18:34:44.000000000 -0500
-@@ -110,7 +110,7 @@
-         break;
- 
-       case SQL_ATTR_ROWS_FETCHED_PTR:
--        *(( SQLUINTEGER ** ) value ) = cl_statement -> rows_fetched_ptr;
-+        *(( SQLULEN ** ) value ) = cl_statement -> rows_fetched_ptr;
-         break;
- 
-       case SQL_ATTR_FETCH_BOOKMARK_PTR:
-diff -Naur unixODBC-2.2.14.orig/cur/SQLGetStmtOption.c unixODBC-2.2.14/cur/SQLGetStmtOption.c
---- unixODBC-2.2.14.orig/cur/SQLGetStmtOption.c	2005-10-27 13:54:49.000000000 -0400
-+++ unixODBC-2.2.14/cur/SQLGetStmtOption.c	2009-02-15 18:34:44.000000000 -0500
-@@ -100,7 +100,7 @@
-         break;
- 
-       case SQL_ATTR_ROWS_FETCHED_PTR:
--        *(( SQLUINTEGER ** ) value ) = cl_statement -> rows_fetched_ptr;
-+        *(( SQLULEN ** ) value ) = cl_statement -> rows_fetched_ptr;
-         break;
- 
-       case SQL_ATTR_USE_BOOKMARKS:
-diff -Naur unixODBC-2.2.14.orig/cur/SQLSetStmtAttr.c unixODBC-2.2.14/cur/SQLSetStmtAttr.c
---- unixODBC-2.2.14.orig/cur/SQLSetStmtAttr.c	2005-10-27 13:54:49.000000000 -0400
-+++ unixODBC-2.2.14/cur/SQLSetStmtAttr.c	2009-02-15 18:34:44.000000000 -0500
-@@ -142,7 +142,7 @@
-         break;
- 
-       case SQL_ATTR_ROWS_FETCHED_PTR:
--        cl_statement -> rows_fetched_ptr = ( SQLUINTEGER * ) value;
-+        cl_statement -> rows_fetched_ptr = ( SQLULEN * ) value;
-         break;
- 
-       case SQL_ATTR_SIMULATE_CURSOR:
-diff -Naur unixODBC-2.2.14.orig/cur/SQLSetStmtOption.c unixODBC-2.2.14/cur/SQLSetStmtOption.c
---- unixODBC-2.2.14.orig/cur/SQLSetStmtOption.c	2005-10-27 13:54:49.000000000 -0400
-+++ unixODBC-2.2.14/cur/SQLSetStmtOption.c	2009-02-15 18:34:44.000000000 -0500
-@@ -145,7 +145,7 @@
-         break;
- 
-       case SQL_ATTR_ROWS_FETCHED_PTR:
--        cl_statement -> rows_fetched_ptr = ( SQLUINTEGER * ) value;
-+        cl_statement -> rows_fetched_ptr = ( SQLULEN * ) value;
-         break;
- 
-       case SQL_ATTR_USE_BOOKMARKS:
-diff -Naur unixODBC-2.2.14.orig/cur/cursorlibrary.h unixODBC-2.2.14/cur/cursorlibrary.h
---- unixODBC-2.2.14.orig/cur/cursorlibrary.h	2007-11-29 07:00:36.000000000 -0500
-+++ unixODBC-2.2.14/cur/cursorlibrary.h	2009-02-15 18:34:44.000000000 -0500
-@@ -75,7 +75,7 @@
-     SQLUINTEGER         rowset_size;
-     SQLUINTEGER         simulate_cursor;
-     SQLUINTEGER         use_bookmarks;
--    SQLUINTEGER         *rows_fetched_ptr;
-+    SQLULEN            *rows_fetched_ptr;
-     SQLUSMALLINT        *row_status_ptr;
-     SQLCHAR             cursor_name[ MAX_CURSOR_NAME + 1 ];
-     CLBCOL              *bound_columns;
-diff -Naur unixODBC-2.2.14.orig/exe/isql.c unixODBC-2.2.14/exe/isql.c
---- unixODBC-2.2.14.orig/exe/isql.c	2008-06-16 07:03:43.000000000 -0400
-+++ unixODBC-2.2.14/exe/isql.c	2009-02-15 18:34:43.000000000 -0500
-@@ -1450,11 +1450,11 @@
-     printf( (char*)szSepLine );
- 
-     SQLRowCount( hStmt, &nRowsAffected );
--    printf( "SQLRowCount returns %d\n", nRowsAffected );
-+    printf( "SQLRowCount returns %ld\n", (long) nRowsAffected );
- 
-     if ( nRows )
-     {
--        printf( "%d rows fetched\n", nRows );
-+        printf( "%ld rows fetched\n", (long) nRows );
-     }
- }
- 
-diff -Naur unixODBC-2.2.14.orig/exe/iusql.c unixODBC-2.2.14/exe/iusql.c
---- unixODBC-2.2.14.orig/exe/iusql.c	2008-09-01 11:10:40.000000000 -0400
-+++ unixODBC-2.2.14/exe/iusql.c	2009-02-15 18:34:43.000000000 -0500
-@@ -742,7 +742,7 @@
-         strcat((char*) szSepLine,(char*) szColumn );
- 
-         /* HDR */
--        sprintf((char*) szColumn, "| %-*s", max( nMaxLength, strlen((char*)szColumnName) ), (char*)szColumnName );
-+        sprintf((char*) szColumn, "| %-*s", (int) max( nMaxLength, strlen((char*)szColumnName) ), (char*)szColumnName );
-         strcat((char*) szHdrLine,(char*) szColumn );
-     }
-     strcat((char*) szSepLine, "+\n" );
-@@ -817,7 +817,7 @@
-             }
-             else
-             {
--                sprintf((char*)  szColumn, "| %-*s", max( nMaxLength, strlen((char*) szColumnName) ), "" );
-+                sprintf((char*)  szColumn, "| %-*s", (int) max( nMaxLength, strlen((char*) szColumnName) ), "" );
-             }
-             fputs((char*)  szColumn, stdout );
-         }
-@@ -841,11 +841,11 @@
-     printf( (char*)szSepLine );
- 
-     SQLRowCount( hStmt, &nRowsAffected );
--    printf( "SQLRowCount returns %d\n", nRowsAffected );
-+    printf( "SQLRowCount returns %ld\n", (long) nRowsAffected );
- 
-     if ( nRows )
-     {
--        printf( "%d rows fetched\n", nRows );
-+        printf( "%ld rows fetched\n", (long) nRows );
-     }
- }
- 
-diff -Naur unixODBC-2.2.14.orig/exe/odbc-config.c unixODBC-2.2.14/exe/odbc-config.c
---- unixODBC-2.2.14.orig/exe/odbc-config.c	2008-05-20 08:58:17.000000000 -0400
-+++ unixODBC-2.2.14/exe/odbc-config.c	2009-02-15 18:34:43.000000000 -0500
-@@ -160,7 +160,7 @@
- 
- static void ulen( void )
- {
--	printf( "-DSIZEOF_SQLULEN=%d\n", sizeof( SQLULEN ));
-+	printf( "-DSIZEOF_SQLULEN=%d\n", (int) sizeof( SQLULEN ));
- }
- 
- int main( int argc, char **argv )
-diff -Naur unixODBC-2.2.14.orig/exe/odbcinst.c unixODBC-2.2.14/exe/odbcinst.c
---- unixODBC-2.2.14.orig/exe/odbcinst.c	2008-11-19 10:27:34.000000000 -0500
-+++ unixODBC-2.2.14/exe/odbcinst.c	2009-02-15 18:34:43.000000000 -0500
-@@ -456,7 +456,7 @@
-     printf( "unixODBC " VERSION "\n" );
- 
-     *szFileName = '\0';
--    sprintf( szFileName, "%s/odbcinst.ini", odbcinst_system_file_path( b1 ), odbcinst_system_file_name( b2 ));
-+    sprintf( szFileName, "%s/odbcinst.ini", odbcinst_system_file_path( b1 ) );
-     printf( "DRIVERS............: %s\n", szFileName ); 
- 
-     *szFileName = '\0';
-@@ -471,9 +471,9 @@
-     _odbcinst_UserINI( szFileName, FALSE );
-     printf( "USER DATA SOURCES..: %s\n", szFileName ); 
- 
--	printf( "SQLULEN Size.......: %d\n", sizeof( SQLULEN )); 
--	printf( "SQLLEN Size........: %d\n", sizeof( SQLLEN )); 
--	printf( "SQLSETPOSIROW Size.: %d\n", sizeof( SQLSETPOSIROW )); 
-+	printf( "SQLULEN Size.......: %d\n", (int) sizeof( SQLULEN )); 
-+	printf( "SQLLEN Size........: %d\n", (int) sizeof( SQLLEN )); 
-+	printf( "SQLSETPOSIROW Size.: %d\n", (int) sizeof( SQLSETPOSIROW )); 
- }
- 
- int main( int argc, char *argv[] )
-diff -Naur unixODBC-2.2.14.orig/extras/snprintf.c unixODBC-2.2.14/extras/snprintf.c
---- unixODBC-2.2.14.orig/extras/snprintf.c	2008-05-13 09:02:28.000000000 -0400
-+++ unixODBC-2.2.14/extras/snprintf.c	2009-02-15 18:34:43.000000000 -0500
-@@ -533,7 +533,7 @@
-   return result;
- }
- 
--static LDOUBLE pow10 (int exponent)
-+static LDOUBLE mypow10 (int exponent)
- {
-   LDOUBLE result = 1;
- 
-@@ -546,7 +546,7 @@
-   return result;
- }
- 
--static long round (LDOUBLE value)
-+static long myround (LDOUBLE value)
- {
-   long intpart;
- 
-@@ -607,12 +607,12 @@
-   /* We "cheat" by converting the fractional part to integer by
-    * multiplying by a factor of 10
-    */
--  fracpart = round ((pow10 (max)) * (ufvalue - intpart));
-+  fracpart = myround ((mypow10 (max)) * (ufvalue - intpart));
- 
--  if (fracpart >= pow10 (max))
-+  if (fracpart >= mypow10 (max))
-   {
-     intpart++;
--    fracpart -= pow10 (max);
-+    fracpart -= mypow10 (max);
-   }
- 
- #ifdef DEBUG_SNPRINTF
-diff -Naur unixODBC-2.2.14.orig/odbcinst/SQLGetInstalledDrivers.c unixODBC-2.2.14/odbcinst/SQLGetInstalledDrivers.c
---- unixODBC-2.2.14.orig/odbcinst/SQLGetInstalledDrivers.c	2008-09-04 07:08:59.000000000 -0400
-+++ unixODBC-2.2.14/odbcinst/SQLGetInstalledDrivers.c	2009-02-15 18:34:44.000000000 -0500
-@@ -27,7 +27,7 @@
- #ifdef VMS
-     sprintf( szIniName, "%s:%s", odbcinst_system_file_path( b1 ), odbcinst_system_file_name( b2 ) );
- #else
--    sprintf( szIniName, "%s/%d", odbcinst_system_file_path( b1 ), odbcinst_system_file_name( b2 ) );
-+    sprintf( szIniName, "%s/%s", odbcinst_system_file_path( b1 ), odbcinst_system_file_name( b2 ) );
- #endif
- 
- #ifdef __OS2__
-diff -Naur unixODBC-2.2.14.orig/odbcinstQ/CStatDetails.cpp unixODBC-2.2.14/odbcinstQ/CStatDetails.cpp
---- unixODBC-2.2.14.orig/odbcinstQ/CStatDetails.cpp	2008-06-30 09:20:44.000000000 -0400
-+++ unixODBC-2.2.14/odbcinstQ/CStatDetails.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -70,11 +70,11 @@
-                 nHandles = uodbc_get_stats( hStats, aPIDs[nPID].value.l_value, aHandles, MAXHANDLES );
-                 if ( nHandles > 0 )
-                 {
--                    qs.sprintf( "%d", aPIDs[nPID].value.l_value );
-+                    qs.sprintf( "%ld", aPIDs[nPID].value.l_value );
-                     pTable->setText( nPID, 0, qs );
-                     for ( nHandle = 0; nHandle < MAXHANDLES; nHandle++ )
-                     {
--                        qs.sprintf( "%d", aHandles[nHandle].value.l_value );
-+                        qs.sprintf( "%ld", aHandles[nHandle].value.l_value );
-                         pTable->setText( nPID, nHandle + 1, qs );
-                     }
-                 }
-diff -Naur unixODBC-2.2.14.orig/odbcinstQ/CStatSummary.cpp unixODBC-2.2.14/odbcinstQ/CStatSummary.cpp
---- unixODBC-2.2.14.orig/odbcinstQ/CStatSummary.cpp	2008-06-30 09:20:44.000000000 -0400
-+++ unixODBC-2.2.14/odbcinstQ/CStatSummary.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -95,22 +95,22 @@
-             if ( aStats[3].value.l_value > nSliderMax )
-                 nSliderMax = aStats[3].value.l_value;
-     
--            qs.sprintf( "%d", aStats[0].value.l_value );
-+            qs.sprintf( "%ld", aStats[0].value.l_value );
-             pEnv->setText( qs );
-             pEnvSlider->setMinValue( 0-nSliderMax );
-             pEnvSlider->setValue( 0-aStats[0].value.l_value );
-             
--            qs.sprintf( "%d", aStats[1].value.l_value );
-+            qs.sprintf( "%ld", aStats[1].value.l_value );
-             pCon->setText( qs );
-             pConSlider->setMinValue( 0-nSliderMax );
-             pConSlider->setValue( 0-aStats[1].value.l_value );
-     
--            qs.sprintf( "%d", aStats[2].value.l_value );
-+            qs.sprintf( "%ld", aStats[2].value.l_value );
-             pSta->setText( qs );
-             pStaSlider->setMinValue( 0-nSliderMax );
-             pStaSlider->setValue( 0-aStats[2].value.l_value );
-     
--            qs.sprintf( "%d", aStats[3].value.l_value );
-+            qs.sprintf( "%ld", aStats[3].value.l_value );
-             pDes->setText( qs );
-             pDesSlider->setMinValue( 0-nSliderMax );
-             pDesSlider->setValue( 0-aStats[3].value.l_value );
-diff -Naur unixODBC-2.2.14.orig/odbctest/attr.cpp unixODBC-2.2.14/odbctest/attr.cpp
---- unixODBC-2.2.14.orig/odbctest/attr.cpp	2007-11-29 07:00:37.000000000 -0500
-+++ unixODBC-2.2.14/odbctest/attr.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -1314,47 +1314,47 @@
- 		{
- 		  case SQL_ATTR_FETCH_BOOKMARK_PTR:
- 			vptr = hand-> bookmark_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_PARAM_BIND_OFFSET_PTR:
- 			vptr = hand-> param_bind_offset_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_PARAM_OPERATION_PTR:
- 			vptr = hand-> param_opt_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_PARAM_STATUS_PTR:
- 			vptr = hand-> param_status_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_PARAMS_PROCESSED_PTR:
- 			vptr = hand-> params_processed_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_ROW_BIND_OFFSET_PTR:
- 			vptr = hand-> row_bind_offset_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_ROW_OPERATION_PTR:
- 			vptr = hand-> row_operation_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_ROW_STATUS_PTR:
- 			vptr = hand-> row_status_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 
- 		  case SQL_ATTR_ROWS_FETCHED_PTR:
- 			vptr = hand-> rows_fetched_ptr;
--			txt.sprintf( "    Value: %x", vptr );
-+			txt.sprintf( "    Value: %p", vptr );
- 			break;
- 		}
- 	}
-@@ -1735,7 +1735,7 @@
- 		{
- 			void *ival;
- 			memcpy( &ival, buf, sizeof( ival ));
--			txt.sprintf( "    ValuePtr = 0x%08X", ival );
-+			txt.sprintf( "    ValuePtr = 0x%08lX", (long) ival );
- 			odbctest -> out_win -> insertLineLimited( txt );
- 		}
- 		else
-diff -Naur unixODBC-2.2.14.orig/odbctest/desc.cpp unixODBC-2.2.14/odbctest/desc.cpp
---- unixODBC-2.2.14.orig/odbctest/desc.cpp	2007-02-12 06:49:37.000000000 -0500
-+++ unixODBC-2.2.14/odbctest/desc.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -382,7 +382,7 @@
-         {
-             if ( field_ident_struct[ diag_info -> currentItem() ].data_type == SQL_CHAR )
-             {
--                txt.sprintf( "    ValuePtr: %s", buf );
-+                txt.sprintf( "    ValuePtr: %s", (char *) buf );
-             }
-             else if ( field_ident_struct[ diag_info -> currentItem() ].data_type == SQL_IS_POINTER )
-             {
-@@ -775,7 +775,7 @@
-             }
-             else
-             {
--                txt.sprintf( "    *LengthPtr: %d", length_val );
-+                txt.sprintf( "    *LengthPtr: %ld", (long) length_val );
-             }
-             odbctest -> out_win -> insertLineLimited( txt );
-         }
-diff -Naur unixODBC-2.2.14.orig/odbctest/env.cpp unixODBC-2.2.14/odbctest/env.cpp
---- unixODBC-2.2.14.orig/odbctest/env.cpp	2007-02-12 06:49:37.000000000 -0500
-+++ unixODBC-2.2.14/odbctest/env.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -470,7 +470,7 @@
- 
-         server_name = new SQLCHAR[ bl1 ];
- 
--		txt.sprintf( "    ServerName: %p", bl1 );
-+		txt.sprintf( "    ServerName: %p", server_name );
-     }
- 	odbctest -> out_win -> insertLineLimited( txt );
- 
-@@ -500,7 +500,7 @@
- 
-         description = new SQLCHAR[ bl1 ];
- 
--		txt.sprintf( "    Description: %p", bl1 );
-+		txt.sprintf( "    Description: %p", description );
-     }
- 	odbctest -> out_win -> insertLineLimited( txt );
- 
-@@ -728,7 +728,7 @@
- 
-         server_name = new SQLCHAR[ bl1 ];
- 
--		txt.sprintf( "    ServerName: %p", bl1 );
-+		txt.sprintf( "    ServerName: %p", server_name );
-     }
- 	odbctest -> out_win -> insertLineLimited( txt );
- 
-@@ -758,7 +758,7 @@
- 
-         description = new SQLCHAR[ bl1 ];
- 
--		txt.sprintf( "    Description: %p", bl1 );
-+		txt.sprintf( "    Description: %p", description );
-     }
- 	odbctest -> out_win -> insertLineLimited( txt );
- 
-diff -Naur unixODBC-2.2.14.orig/odbctest/odbctest.h unixODBC-2.2.14/odbctest/odbctest.h
---- unixODBC-2.2.14.orig/odbctest/odbctest.h	2007-02-12 06:49:37.000000000 -0500
-+++ unixODBC-2.2.14/odbctest/odbctest.h	2009-02-15 18:34:44.000000000 -0500
-@@ -103,7 +103,7 @@
- 	SQLUINTEGER *row_bind_offset_ptr, row_bind_offset;
- 	SQLUSMALLINT *row_operation_ptr, row_operation;
- 	SQLUSMALLINT *row_status_ptr, row_status;
--	SQLUINTEGER *rows_fetched_ptr, rows_fetched;
-+	SQLULEN *rows_fetched_ptr, rows_fetched;
- 
- private:
- 	int type;
-diff -Naur unixODBC-2.2.14.orig/odbctest/results.cpp unixODBC-2.2.14/odbctest/results.cpp
---- unixODBC-2.2.14.orig/odbctest/results.cpp	2007-04-17 11:16:17.000000000 -0400
-+++ unixODBC-2.2.14/odbctest/results.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -815,7 +815,7 @@
- 		}
- 		else
- 		{
--			txt.sprintf( "    *Strlen_or_Ind Ptr: %d", strlen_or_ind );
-+			txt.sprintf( "    *Strlen_or_Ind Ptr: %ld", (long) strlen_or_ind );
- 		}
- 		odbctest -> out_win -> insertLineLimited( txt );
- 	}
-@@ -945,7 +945,7 @@
- 				long val;
- 
- 				memcpy( &val, buf, sizeof( val ));
--				txt.sprintf( "    *Target Value Ptr: %d (0x%x)", val, val );
-+				txt.sprintf( "    *Target Value Ptr: %ld (0x%lx)", val, val );
- 				break;
- 			}
- 
-@@ -964,7 +964,7 @@
- 				long val;
- 
- 				memcpy( &val, buf, sizeof( val ));
--				txt.sprintf( "    *Target Value Ptr: %d (0x%x)", val, val );
-+				txt.sprintf( "    *Target Value Ptr: %ld (0x%lx)", val, val );
- 				break;
- 			}
- 
-@@ -1433,7 +1433,7 @@
- 			}
- 			else
- 			{
--				txt.sprintf( "    *Column Size Ptr: %d", column_size );
-+				txt.sprintf( "    *Column Size Ptr: %ld", (long) column_size );
- 			}
- 			odbctest -> out_win -> insertLineLimited( txt );
- 		}
-@@ -1596,7 +1596,7 @@
- 	}
- 	else
- 	{
--		txt.sprintf( "    *RowCountPtr: %d", num_rows );
-+		txt.sprintf( "    *RowCountPtr: %ld", (long) num_rows );
- 	}
- 	odbctest -> out_win -> insertLineLimited( txt );
- 
-@@ -2047,7 +2047,7 @@
- 
-             if ( buf )
-             {
--	            txt.sprintf( "    *CharacterAttributePtr: %s", buf );
-+	            txt.sprintf( "    *CharacterAttributePtr: %s", (char *) buf );
- 	            odbctest -> out_win -> insertLineLimited( txt );
-             }
-         }
-@@ -2055,7 +2055,7 @@
-         {
-             if ( numeric_ptr )
-             {
--	            txt.sprintf( "    *NumericAttributePtr: %d", numeric_value );
-+	            txt.sprintf( "    *NumericAttributePtr: %ld", (long) numeric_value );
- 	            odbctest -> out_win -> insertLineLimited( txt );
-             }
-         }
-@@ -2311,7 +2311,7 @@
- 
-             if ( buf )
-             {
--	            txt.sprintf( "    *rgbDesc: %s", buf );
-+	            txt.sprintf( "    *rgbDesc: %s", (char *) buf );
- 	            odbctest -> out_win -> insertLineLimited( txt );
-             }
-         }
-@@ -2319,7 +2319,7 @@
-         {
-             if ( numeric_ptr )
-             {
--	            txt.sprintf( "    *pfDesc: %d", numeric_value );
-+	            txt.sprintf( "    *pfDesc: %ld", (long) numeric_value );
- 	            odbctest -> out_win -> insertLineLimited( txt );
-             }
-         }
-@@ -2554,7 +2554,7 @@
- 	SQLHANDLE in_handle = SQL_NULL_HANDLE;
- 	SQLSMALLINT fetch_orentation;
-     SQLINTEGER fetch_offset;
--    SQLUINTEGER row_count, *row_count_ptr;
-+    SQLULEN row_count, *row_count_ptr;
-     SQLUSMALLINT *row_status_array;
- 	int index;
- 
-@@ -2616,7 +2616,7 @@
- 	    odbctest -> out_win -> insertLineLimited( "  Out:" );
-         if ( row_count_ptr )
-         {
--            txt.sprintf( "    *RowCountPtr: %d", row_count);
-+            txt.sprintf( "    *RowCountPtr: %ld", (long) row_count);
-             odbctest -> out_win -> insertLineLimited( txt );
-         }
-         if ( row_status_array )
-diff -Naur unixODBC-2.2.14.orig/odbctest/stmt.cpp unixODBC-2.2.14/odbctest/stmt.cpp
---- unixODBC-2.2.14.orig/odbctest/stmt.cpp	2007-02-13 01:14:21.000000000 -0500
-+++ unixODBC-2.2.14/odbctest/stmt.cpp	2009-02-15 18:34:44.000000000 -0500
-@@ -1307,7 +1307,7 @@
- 	else
- 	{
- 		decimal_digits_ptr = &decimal_digits;
--		txt.sprintf( "    DecimalDigitsPtr: %p", decimal_digits );
-+		txt.sprintf( "    DecimalDigitsPtr: %p", decimal_digits_ptr );
- 	}
- 	odbctest -> out_win -> insertLineLimited( txt );
- 	decimal_digits = -9999;
-@@ -1366,7 +1366,7 @@
- 			}
- 			else
- 			{
--				txt.sprintf( "    *ParamSizePtr: %d", param_size );
-+				txt.sprintf( "    *ParamSizePtr: %ld", (long) param_size );
- 			}
- 			odbctest -> out_win -> insertLineLimited( txt );
- 		}
-@@ -1518,7 +1518,7 @@
- 	{
- 		if ( value_ptr )
- 		{	
--            txt.sprintf( "    *ValuePtr: %d", value );
-+            txt.sprintf( "    *ValuePtr: %ld", (long) value );
- 			odbctest -> out_win -> insertLineLimited( txt );
- 		}
- 	}
-@@ -1712,13 +1712,13 @@
- 			data_ptr_var = NULL;
- 		else 
- 			data_ptr_var = (SQLPOINTER) s->latin1();
--		txt.sprintf( "    DataPtr: %s", data_ptr_var );
-+		txt.sprintf( "    DataPtr: %p", data_ptr_var );
- 		odbctest -> out_win -> insertLineLimited( txt );
- 	}
- 	else
- 	{
-         data_ptr_var = ( SQLPOINTER ) data_str;
--		txt.sprintf( "    DataPtr: %s", data_ptr_var );
-+		txt.sprintf( "    DataPtr: %s", (char *) data_ptr_var );
- 		odbctest -> out_win -> insertLineLimited( txt );
- 	}
- 
-diff -Naur unixODBC-2.2.14.orig/samples/helper.c unixODBC-2.2.14/samples/helper.c
---- unixODBC-2.2.14.orig/samples/helper.c	2001-12-13 08:00:34.000000000 -0500
-+++ unixODBC-2.2.14/samples/helper.c	2009-02-15 18:34:43.000000000 -0500
-@@ -96,7 +96,7 @@
-         {
-             sprintf(qbuf, "create table \"%s\" "
-                     "(a INTEGER PRIMARY KEY, b %s(%ld))",
--                    table_name, type, length);
-+                    table_name, type, (long) length);
-         }
-         else
-         {
-@@ -728,7 +728,7 @@
-         if (SQL_SUCCEEDED(ret))
-         {
-             sprintf(cbuf, "** error: %s:%d:%ld:%s **\n",
--                    state, i, native, text);
-+                    state, i, (long) native, text);
-              szLogPrintf( srv_info, FALSE, cbuf);
-         }
-     }