Fix a complie error on Windows platform.

diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c
index 59dffbdcf9e062731cfd9926aa9cc303dfdf68ac..799b8c5b77227b1d28bfded2d75b8439a57fdf3d 100644 (file)
--- a/src/interfaces/odbc/convert.c
+++ b/src/interfaces/odbc/convert.c
@@ -17,8 +17,6 @@
  */
 /* Multibyte support  Eiji Tokuya      2001-03-15      */
 
-#include "convert.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -37,6 +35,7 @@
 #include <sqlext.h>
 #endif
 
+#include "convert.h"
 #include <time.h>
 #include <math.h>
 #include <stdlib.h>
@@ -939,7 +938,7 @@ into_table_from(const char *stmt)
 /*
  *     This function inserts parameters into an SQL statements.
  *     It will also modify a SELECT statement for use with declare/fetch cursors.
- *     This function does a dynamic memory allocation to get rid of query siz elimit!
+ *     This function does a dynamic memory allocation to get rid of query size limit!
  */
 int
 copy_statement_with_parameters(StatementClass *stmt)
@@ -961,8 +960,7 @@ copy_statement_with_parameters(StatementClass *stmt)
        time_t          t = time(NULL);
        struct tm  *tim;
        SDWORD          used;
-       char       *buffer,
-                          *buf;
+       char            *buffer, *buf;
        BOOL            in_quote = FALSE, in_dquote = FALSE, in_escape = FALSE;
        Oid                     lobj_oid;
        int                     lobj_fd,

diff --git a/src/interfaces/odbc/convert.h b/src/interfaces/odbc/convert.h
index 4a142db3d5c16d9c4accbeb78d741f0cf97ccc78..8a7d15e5d4b8f74e9eb495b0e5715c68ce76159f 100644 (file)
--- a/src/interfaces/odbc/convert.h
+++ b/src/interfaces/odbc/convert.h
@@ -11,10 +11,8 @@
 
 #include "psqlodbc.h"
 
-#include "isql.h"
-
 /* copy_and_convert results */
-#define COPY_OK                                                                        0
+#define COPY_OK                                                        0
 #define COPY_UNSUPPORTED_TYPE                                  1
 #define COPY_UNSUPPORTED_CONVERSION                            2
 #define COPY_RESULT_TRUNCATED                                  3