Fix contrib/dbase to compile under Win32. Laurent Ballester

diff --git a/contrib/dbase/dbf.h b/contrib/dbase/dbf.h
index 254e8d19e996e31448afab2878e1cf04840f8495..5c882fc7a87f0b8e230b8a08fc1fa00a609cf22e 100644 (file)
--- 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 9a1f89ea1f856664686b6801c6150d5b5509af86..52561cf247f3464c6c4414614f1e1e0f8703c66e 100644 (file)
--- 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')