diff options
author | Thomas G. Lockhart | 1998-10-28 17:09:22 +0000 |
---|---|---|
committer | Thomas G. Lockhart | 1998-10-28 17:09:22 +0000 |
commit | 571d1216641b77dcb1e301eb887162c8b590581a (patch) | |
tree | 66931f5f04a9021dc69583f3059a74193029d490 | |
parent | f4ccb5e170f61dc4051cd8a0183cdea75d2e9368 (diff) |
Fix macro declarations to allow disabling mylog() and qlog() on Unix boxes.
Fix spelling of "DIRSEPARATOR".
-rw-r--r-- | src/interfaces/odbc/misc.c | 2 | ||||
-rw-r--r-- | src/interfaces/odbc/misc.h | 44 |
2 files changed, 27 insertions, 19 deletions
diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c index 7e1501842c6..94a116299b1 100644 --- a/src/interfaces/odbc/misc.c +++ b/src/interfaces/odbc/misc.c @@ -44,7 +44,7 @@ generate_filename(char* dirname,char* prefix,char* filename) return; strcpy(filename,dirname); - strcat(filename,DIRSEPERATOR); + strcat(filename,DIRSEPARATOR); if(prefix != 0) strcat(filename,prefix); #ifndef WIN32 diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h index 3e17e1362a5..10cb5114d13 100644 --- a/src/interfaces/odbc/misc.h +++ b/src/interfaces/odbc/misc.h @@ -39,33 +39,41 @@ #ifdef MY_LOG -#define MYLOGFILE "mylog_" -#ifndef WIN32 -#define MYLOGDIR "/tmp" -#else -#define MYLOGDIR "c:" -#endif -void mylog(); /* prototype */ + #define MYLOGFILE "mylog_" + #ifndef WIN32 + #define MYLOGDIR "/tmp" + #else + #define MYLOGDIR "c:" + #endif + void mylog(); /* prototype */ #else -#define mylog // mylog + #ifndef WIN32 + #define mylog(args...) /* GNU convention for variable arguments */ + #else + #define mylog // mylog + #endif #endif #ifdef Q_LOG -#define QLOGFILE "psqlodbc_" -#ifndef WIN32 -#define QLOGDIR "/tmp" -#else -#define QLOGDIR "c:" -#endif -void qlog(); /* prototype */ + #define QLOGFILE "psqlodbc_" + #ifndef WIN32 + #define QLOGDIR "/tmp" + #else + #define QLOGDIR "c:" + #endif + void qlog(); /* prototype */ #else -#define qlog // qlog + #ifndef WIN32 + #define qlog(args...) /* GNU convention for variable arguments */ + #else + #define qlog // qlog + #endif #endif #ifndef WIN32 -#define DIRSEPERATOR "/" +#define DIRSEPARATOR "/" #else -#define DIRSEPERATOR "\\" +#define DIRSEPARATOR "\\" #endif void remove_newlines(char *string); |