From 11a4a61a448f3d817b2f577a6db0faa73a66e461 Mon Sep 17 00:00:00 2001
From: Hiroshi Inoue <inoue@tpf.co.jp>
Date: Tue, 31 Dec 2002 00:28:25 +0000
Subject: [PATCH] The preparation of ODBC3 support under *nix.

---
 Makefile.am | 4 ++--
 info30.c    | 6 +++---
 odbcapi30.c | 6 +++---
 pgapi30.c   | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d2f19e5..57ea289 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # Makefile.am for psqlodbc (PostgreSQL ODBC driver)
 #
-# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.4 2002/11/29 13:04:29 dpage Exp $
+# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.5 2002/12/31 00:28:25 hinoue Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ psqlodbc_la_SOURCES = \
 	pgtypes.c psqlodbc.c qresult.c results.c socket.c parse.c \
 	statement.c tuple.c tuplelist.c dlg_specific.c odbcapi.c \
 	multibyte.c \
-	gpps.c
+	gpps.c odbcapi30.c pgapi30.c info30.c
 
 psqlodbc_la_SOURCES += \
 	bind.h columninfo.h connection.h convert.h descriptor.h \
diff --git a/info30.c b/info30.c
index 111da5d..741949b 100644
--- a/info30.c
+++ b/info30.c
@@ -6,10 +6,9 @@
  *
  */
 
-#ifndef ODBCVER
-#define ODBCVER 0x0300
-#endif
+#include "psqlodbc.h"
 
+#if (ODBCVER >= 0x0300)
 #include "connection.h"
 #include "pgapifunc.h"
 
@@ -397,3 +396,4 @@ PGAPI_GetInfo30(HDBC hdbc, UWORD fInfoType, PTR rgbInfoValue,
 		*pcbInfoValue = len;
 	return result;
 }
+#endif /* ODBCVER >= 0x0300 */
diff --git a/odbcapi30.c b/odbcapi30.c
index 7b828e8..f9afc32 100644
--- a/odbcapi30.c
+++ b/odbcapi30.c
@@ -18,10 +18,9 @@
  *-------
  */
 
-#ifndef ODBCVER
-#define ODBCVER 0x0300
-#endif
 #include "psqlodbc.h"
+
+#if (ODBCVER >= 0x0300)
 #include <stdio.h>
 #include <string.h>
 
@@ -644,3 +643,4 @@ SQLBulkOperations(HSTMT hstmt, SQLSMALLINT operation)
 	LEAVE_STMT_CS(stmt);
 	return ret;
 }	
+#endif /* ODBCVER >= 0x0300 */
diff --git a/pgapi30.c b/pgapi30.c
index 4cddc30..94cb150 100644
--- a/pgapi30.c
+++ b/pgapi30.c
@@ -14,10 +14,9 @@
  *-------
  */
 
-#ifndef ODBCVER
-#define ODBCVER 0x0300
-#endif
 #include "psqlodbc.h"
+
+#if (ODBCVER >= 0x0300)
 #include <stdio.h>
 #include <string.h>
 
@@ -1769,3 +1768,4 @@ PGAPI_BulkOperations(HSTMT hstmt, SQLSMALLINT operation)
 	return ret;
 }	
 #endif /* DRIVER_CURSOR_IMPLEMENT */
+#endif /* ODBCVER >= 0x0300 */
-- 
2.39.5