More odbc include cleanups

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

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);

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