Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitfc56468

Browse files
committed
Fix contrib/dbase to compile under Win32. Laurent Ballester
1 parent296fb57 commitfc56468

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

‎contrib/dbase/dbf.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
#ifndef_DBF_H
99
#define_DBF_H
1010

11+
#ifdef_WIN32
12+
#include<gmon.h>/* we need it to define u_char type */
13+
#endif
1114
#include<sys/types.h>
1215

1316
/**********************************************************************

‎contrib/dbase/dbf2pg.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ voiddo_create(PGconn *, char *, dbhead *);
5757
voiddo_inserts(PGconn*,char*,dbhead*);
5858
intcheck_table(PGconn*,char*);
5959

60-
char*Escape(char*);
60+
char*Escape_db(char*);
6161

6262
#ifdefHAVE_ICONV_H
6363
char*convert_charset(char*string);
@@ -110,7 +110,7 @@ strtolower(char *string)
110110

111111
/* FIXME: should this check for overflow? */
112112
char*
113-
Escape(char*string)
113+
Escape_db(char*string)
114114
{
115115
char*foo,
116116
*bar;
@@ -466,7 +466,7 @@ do_inserts(PGconn *conn, char *table, dbhead * dbh)
466466
if (charset_from)
467467
foo=convert_charset(foo);
468468
#endif
469-
foo=Escape(foo);
469+
foo=Escape_db(foo);
470470

471471
/* handle the date first - liuk */
472472
if (fields[h].db_type=='D')

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp