Miscellaneous changes to align psqlodbc with unixODBC 64-bit fixes.


diff -Naur psqlodbc-08.03.0200.orig/odbcapi30.c psqlodbc-08.03.0200/odbcapi30.c
--- psqlodbc-08.03.0200.orig/odbcapi30.c	2006-11-14 10:29:25.000000000 -0500
+++ psqlodbc-08.03.0200/odbcapi30.c	2009-02-16 13:05:58.000000000 -0500
@@ -118,13 +118,7 @@
 			SQLPOINTER CharacterAttribute,
 			SQLSMALLINT BufferLength,
 			SQLSMALLINT *StringLength,
-#if defined(_WIN64)
 			SQLLEN *NumericAttribute
-#elif defined(WITH_UNIXODBC) || defined(WIN32)
-			SQLPOINTER NumericAttribute
-#else
-			SQLLEN *NumericAttribute
-#endif
 			)
 {
 	CSTR	func = "SQLColAttribute";
diff -Naur psqlodbc-08.03.0200.orig/odbcapi30w.c psqlodbc-08.03.0200/odbcapi30w.c
--- psqlodbc-08.03.0200.orig/odbcapi30w.c	2007-04-03 10:49:02.000000000 -0400
+++ psqlodbc-08.03.0200/odbcapi30w.c	2009-02-16 13:08:05.000000000 -0500
@@ -255,11 +255,7 @@
 	SQLPOINTER	pCharAttr,
 	SQLSMALLINT	cbCharAttrMax,	
 	SQLSMALLINT	*pcbCharAttr,
-#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64))
-	SQLPOINTER	pNumAttr
-#else
 	SQLLEN		*pNumAttr
-#endif
 	)
 {
 	CSTR func = "SQLColAttributeW";
diff -Naur psqlodbc-08.03.0200.orig/psqlodbc.h psqlodbc-08.03.0200/psqlodbc.h
--- psqlodbc-08.03.0200.orig/psqlodbc.h	2008-05-03 01:57:42.000000000 -0400
+++ psqlodbc-08.03.0200/psqlodbc.h	2009-02-16 13:02:22.000000000 -0500
@@ -235,9 +235,6 @@
 #else
 #define DRIVER_FILE_NAME			"PSQLODBC25.DLL"
 #endif   /* ODBCVER 0x0300 */
-BOOL isMsAccess();
-BOOL isMsQuery();
-BOOL isSqlServr();
 #else
 #ifdef  UNICODE_SUPPORT
 #define DRIVER_FILE_NAME                        "psqlodbcw.so"
@@ -246,6 +243,10 @@
 #endif
 #endif   /* WIN32 */
 
+BOOL isMsAccess();
+BOOL isMsQuery();
+BOOL isSqlServr();
+
 #define	NULL_CATALOG_NAME				""
 
 /* ESCAPEs */