aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHiroshi Inoue <inoue@tpf.co.jp>2001-08-27 00:18:03 +0000
committerHiroshi Inoue <inoue@tpf.co.jp>2001-08-27 00:18:03 +0000
commitaf7001468633496bcfaab4078fc9fb6f008f4bfa (patch)
tree657497ae04c26be323244a7c12018b1ada5c9a11 /src
parent34fd50880f834b4944525b9120eccbec2f8d5be4 (diff)
downloadpostgresql-af7001468633496bcfaab4078fc9fb6f008f4bfa.tar.gz
postgresql-af7001468633496bcfaab4078fc9fb6f008f4bfa.zip
Fix a complie error on Windows platform.
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/odbc/convert.c8
-rw-r--r--src/interfaces/odbc/convert.h4
2 files changed, 4 insertions, 8 deletions
diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c
index 59dffbdcf9e..799b8c5b772 100644
--- 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 4a142db3d5c..8a7d15e5d4b 100644
--- 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