diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-06-08 17:08:54 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-06-08 17:08:54 +0000 |
| commit | c709f564756e589f0825dba1cac91371a3f62344 (patch) | |
| tree | f9eca1f9ee245dde94c3a0486d531f669d004009 /src | |
| parent | e1eee4cf06befeadb939edf54124e8f724fc605f (diff) | |
| download | postgresql-c709f564756e589f0825dba1cac91371a3f62344.tar.gz postgresql-c709f564756e589f0825dba1cac91371a3f62344.zip | |
More odbc include cleanups
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/odbc/gpps.c | 2 | ||||
| -rw-r--r-- | src/interfaces/odbc/misc.h | 11 | ||||
| -rw-r--r-- | 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 936e1aebe6d..55a8deba8d5 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 23875813fa4..ebe56ea9d80 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 ff90903dfe4..5386075df6e 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 |