From c709f564756e589f0825dba1cac91371a3f62344 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 8 Jun 2000 17:08:54 +0000
Subject: [PATCH] More odbc include cleanups

---
 src/interfaces/odbc/gpps.c     |  2 +-
 src/interfaces/odbc/misc.h     | 11 +++++++++++
 src/interfaces/odbc/psqlodbc.h | 10 ----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/interfaces/odbc/gpps.c b/src/interfaces/odbc/gpps.c
index 936e1aebe6..55a8deba8d 100644
--- a/src/interfaces/odbc/gpps.c
+++ b/src/interfaces/odbc/gpps.c
@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 #include <string.h>
-#include "psqlodbc.h"
+#include "misc.h"
 #include "gpps.h"
 
 #ifndef TRUE
diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h
index 23875813fa..ebe56ea9d8 100644
--- a/src/interfaces/odbc/misc.h
+++ b/src/interfaces/odbc/misc.h
@@ -76,6 +76,17 @@
 #define DIRSEPARATOR	"\\"
 #endif
 
+#ifdef WIN32
+#define PG_BINARY	O_BINARY
+#define	PG_BINARY_R	"rb"
+#define	PG_BINARY_W	"wb"
+#else
+#define	PG_BINARY	0
+#define	PG_BINARY_R	"r"
+#define	PG_BINARY_W	"w"
+#endif
+
+
 void remove_newlines(char *string);
 char *strncpy_null(char *dst, const char *src, int len);
 char *trim(char *string);
diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h
index ff90903dfe..5386075df6 100644
--- a/src/interfaces/odbc/psqlodbc.h
+++ b/src/interfaces/odbc/psqlodbc.h
@@ -49,16 +49,6 @@ typedef UInt4 Oid;
 #define DRIVER_FILE_NAME		"libpsqlodbc.so"
 #endif
 
-#ifdef WIN32
-#define PG_BINARY	O_BINARY
-#define	PG_BINARY_R	"rb"
-#define	PG_BINARY_W	"wb"
-#else
-#define	PG_BINARY	0
-#define	PG_BINARY_R	"r"
-#define	PG_BINARY_W	"w"
-#endif
-
 /* Limits */
 #ifdef WIN32
 #define BLCKSZ                      4096
-- 
2.40.0