Fix contrib/dbase to compile under Win32. Laurent Ballester

tglsfdc · tglsfdc · commit fc564686a76f · 2004-09-14T03:28:28.000Z
diff --git 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
@@ -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')
