Fix macro declarations to allow disabling mylog() and qlog() on Unix boxes.

Fix spelling of "DIRSEPARATOR".

diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c
index 7e1501842c6ce98248887920a60dd0943b0a42bf..94a116299b1a07748761bef70ab2e183123ac20a 100644 (file)
--- 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 3e17e1362a5355dde503d6caabd4df8eb03ff795..10cb5114d13a0597e5217d632575e41f03761cef 100644 (file)
--- 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);