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

Commitc42581e

Browse files
committed
Allow interfaces to compile under MingGW/Win32 by adding _P to symbols
in ecpg.
1 parent32be720 commitc42581e

File tree

6 files changed

+111
-70
lines changed

6 files changed

+111
-70
lines changed

‎src/include/port.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: port.h,v 1.2 2003/05/1601:57:51 momjian Exp $
9+
* $Id: port.h,v 1.3 2003/05/1604:59:22 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -34,6 +34,7 @@ int pgunlink(const char *path);
3434
#endif
3535

3636
externintcopydir(char*fromdir,char*todir);
37+
/* Last parameter not used */
3738
externintgettimeofday(structtimeval*tp,structtimezone*tzp);
3839

3940
#else

‎src/include/port/win32.h‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Header: /cvsroot/pgsql/src/include/port/win32.h,v 1.10 2003/05/15 16:35:29 momjian Exp $ */
1+
/* $Header: /cvsroot/pgsql/src/include/port/win32.h,v 1.11 2003/05/16 04:59:22 momjian Exp $ */
22

33
/* undefine and redefine after #include */
44
#undef mkdir
@@ -164,15 +164,3 @@ struct timezone
164164
#defineECONNRESET WSAECONNRESET
165165
#defineEINPROGRESS WSAEINPROGRESS
166166

167-
/*
168-
* Supplement to <math.h>.
169-
*/
170-
#defineisnan _isnan
171-
#definefinite _finite
172-
externdoublerint(doublex);
173-
174-
/*
175-
* Supplement to <stdio.h>.
176-
*/
177-
#definesnprintf _snprintf
178-
#definevsnprintf _vsnprintf

‎src/interfaces/ecpg/preproc/c_keywords.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ static ScanKeyword ScanKeywords[] = {
2525
{"bool",SQL_BOOL},
2626
{"char",CHAR_P},
2727
{"const",S_CONST},
28-
{"double",DOUBLE},
28+
{"double",DOUBLE_P},
2929
{"enum",SQL_ENUM},
3030
{"extern",S_EXTERN},
3131
{"float",FLOAT_P},
32-
{"int",INT},
32+
{"int",INT_P},
3333
{"long",SQL_LONG},
3434
{"register",S_REGISTER},
3535
{"short",SQL_SHORT},

‎src/interfaces/ecpg/preproc/keywords.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.56 2003/02/14 13:17:13 meskes Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.57 2003/05/16 04:59:22 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -29,7 +29,7 @@
2929
staticScanKeywordScanKeywords[]= {
3030
/* name, value */
3131
{"abort",ABORT_P},
32-
{"absolute",ABSOLUTE},
32+
{"absolute",ABSOLUTE_P},
3333
{"access",ACCESS},
3434
{"action",ACTION},
3535
{"add",ADD},
@@ -54,7 +54,7 @@ static ScanKeyword ScanKeywords[] = {
5454
{"bigint",BIGINT},
5555
{"binary",BINARY},
5656
{"bit",BIT},
57-
{"boolean",BOOLEAN},
57+
{"boolean",BOOLEAN_P},
5858
{"both",BOTH},
5959
{"by",BY},
6060
{"cache",CACHE},
@@ -96,7 +96,7 @@ static ScanKeyword ScanKeywords[] = {
9696
{"day",DAY_P},
9797
{"deallocate",DEALLOCATE},
9898
{"dec",DEC},
99-
{"decimal",DECIMAL},
99+
{"decimal",DECIMAL_P},
100100
{"declare",DECLARE},
101101
{"default",DEFAULT},
102102
{"deferrable",DEFERRABLE},
@@ -109,7 +109,7 @@ static ScanKeyword ScanKeywords[] = {
109109
{"distinct",DISTINCT},
110110
{"do",DO},
111111
{"domain",DOMAIN_P},
112-
{"double",DOUBLE},
112+
{"double",DOUBLE_P},
113113
{"drop",DROP},
114114
{"each",EACH},
115115
{"else",ELSE},
@@ -153,11 +153,11 @@ static ScanKeyword ScanKeywords[] = {
153153
{"initially",INITIALLY},
154154
{"inner",INNER_P},
155155
{"inout",INOUT},
156-
{"input",INPUT},
156+
{"input",INPUT_P},
157157
{"insensitive",INSENSITIVE},
158158
{"insert",INSERT},
159159
{"instead",INSTEAD},
160-
{"int",INT},
160+
{"int",INT_P},
161161
{"integer",INTEGER},
162162
{"intersect",INTERSECT},
163163
{"interval",INTERVAL},
@@ -237,7 +237,7 @@ static ScanKeyword ScanKeywords[] = {
237237
{"recheck",RECHECK},
238238
{"references",REFERENCES},
239239
{"reindex",REINDEX},
240-
{"relative",RELATIVE},
240+
{"relative",RELATIVE_P},
241241
{"rename",RENAME},
242242
{"replace",REPLACE},
243243
{"reset",RESET},
@@ -273,7 +273,7 @@ static ScanKeyword ScanKeywords[] = {
273273
{"stdin",STDIN},
274274
{"stdout",STDOUT},
275275
{"storage",STORAGE},
276-
{"strict",STRICT},
276+
{"strict",STRICT_P},
277277
{"substring",SUBSTRING},
278278
{"sysid",SYSID},
279279
{"table",TABLE},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp