diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-14 03:28:28 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-14 03:28:28 +0000 |
| commit | fc564686a76ff045a4dba85a3b077de4fe4b64b6 (patch) | |
| tree | 00e2cb25203786aeafcaed474206ac28955d6bd0 | |
| parent | 296fb57b2009c0dd69fe7444b5210afd5f7996f2 (diff) | |
| download | postgresql-fc564686a76ff045a4dba85a3b077de4fe4b64b6.tar.gz postgresql-fc564686a76ff045a4dba85a3b077de4fe4b64b6.zip | |
Fix contrib/dbase to compile under Win32. Laurent Ballester
| -rw-r--r-- | contrib/dbase/dbf.h | 3 | ||||
| -rw-r--r-- | contrib/dbase/dbf2pg.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/contrib/dbase/dbf.h b/contrib/dbase/dbf.h index 254e8d19e99..5c882fc7a87 100644 --- a/contrib/dbase/dbf.h +++ b/contrib/dbase/dbf.h @@ -8,6 +8,9 @@ #ifndef _DBF_H #define _DBF_H +#ifdef _WIN32 +#include <gmon.h> /* we need it to define u_char type */ +#endif #include <sys/types.h> /********************************************************************** diff --git a/contrib/dbase/dbf2pg.c b/contrib/dbase/dbf2pg.c index 9a1f89ea1f8..52561cf247f 100644 --- a/contrib/dbase/dbf2pg.c +++ b/contrib/dbase/dbf2pg.c @@ -57,7 +57,7 @@ void do_create(PGconn *, char *, dbhead *); void do_inserts(PGconn *, char *, dbhead *); int check_table(PGconn *, char *); -char *Escape(char *); +char *Escape_db(char *); #ifdef HAVE_ICONV_H char *convert_charset(char *string); @@ -110,7 +110,7 @@ strtolower(char *string) /* FIXME: should this check for overflow? */ char * -Escape(char *string) +Escape_db(char *string) { char *foo, *bar; @@ -466,7 +466,7 @@ do_inserts(PGconn *conn, char *table, dbhead * dbh) if (charset_from) foo = convert_charset(foo); #endif - foo = Escape(foo); + foo = Escape_db(foo); /* handle the date first - liuk */ if (fields[h].db_type == 'D') |