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

Commitdc4ee8a

Browse files
committed
Back out patch that got bundled into another patch.
1 parenta647e30 commitdc4ee8a

File tree

15 files changed

+18
-90
lines changed

15 files changed

+18
-90
lines changed

‎src/backend/libpq/ip.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.13 2003/06/12 08:02:53 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.14 2003/06/12 08:11:07 momjian Exp $
1212
*
1313
* This file and the IPV6 implementation were initially provided by
1414
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
@@ -20,8 +20,6 @@
2020
/* This is intended to be used in both frontend and backend, so use c.h */
2121
#include"c.h"
2222

23-
#if !defined(_MSC_VER)&& !defined(__BORLANDC__)
24-
2523
#include<errno.h>
2624
#include<unistd.h>
2725
#include<sys/types.h>
@@ -35,8 +33,6 @@
3533
#include<arpa/inet.h>
3634
#include<sys/file.h>
3735

38-
#endif
39-
4036
#include"libpq/ip.h"
4137

4238

‎src/backend/utils/mb/encnames.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Encoding names and routines for work with it. All
33
* in this file is shared bedween FE and BE.
44
*
5-
* $Id: encnames.c,v 1.14 2003/06/12 08:02:53 momjian Exp $
5+
* $Id: encnames.c,v 1.15 2003/06/12 08:11:07 momjian Exp $
66
*/
77
#ifdefFRONTEND
88
#include"postgres_fe.h"
@@ -13,9 +13,7 @@
1313
#include"utils/builtins.h"
1414
#endif
1515

16-
#if !defined(_MSC_VER)&& !defined(__BORLANDC__)
1716
#include<unistd.h>
18-
#endif
1917

2018
#include"mb/pg_wchar.h"
2119
#include<ctype.h>

‎src/include/c.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
15-
* $Id: c.h,v 1.148 2003/06/12 08:02:56 momjian Exp $
15+
* $Id: c.h,v 1.149 2003/06/12 08:11:07 momjian Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -73,7 +73,7 @@
7373
#include<SupportDefs.h>
7474
#endif
7575

76-
#if defined(WIN32)&& !defined(_MSC_VER)&& !defined(__BORLANDC__)
76+
#ifdefWIN32
7777
/* We have to redefine some system functions after they are included above */
7878
#include"pg_config_os.h"
7979
#endif

‎src/include/getaddrinfo.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@
1616
*
1717
* Copyright (c) 2003, PostgreSQL Global Development Group
1818
*
19-
* $Id: getaddrinfo.h,v 1.4 2003/06/12 08:02:56 momjian Exp $
19+
* $Id: getaddrinfo.h,v 1.5 2003/06/12 08:11:07 momjian Exp $
2020
*
2121
*-------------------------------------------------------------------------
2222
*/
2323
#ifndefGETADDRINFO_H
2424
#defineGETADDRINFO_H
2525

26-
#if !defined(WIN32)|| (!defined(_MSC_VER)&& !defined(__BORLANDC__))
2726
#include<sys/socket.h>
2827
#include<netdb.h>
29-
#endif
3028

3129

3230
#ifndefHAVE_STRUCT_ADDRINFO

‎src/include/pg_config.h.win32

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
#define HAVE_ATEXIT
2222
#define HAVE_MEMMOVE
2323

24-
#ifdef __BORLANDC__
25-
#define HAVE_RANDOM
26-
#endif
27-
2824
/* use _snprintf instead of snprintf */
2925
#defineHAVE_DECL_SNPRINTF 1
3026
#define snprintf_snprintf

‎src/include/port.h

Lines changed: 1 addition & 3 deletions
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.4 2003/06/12 08:02:56 momjian Exp $
9+
* $Id: port.h,v 1.5 2003/06/12 08:11:07 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -76,10 +76,8 @@ extern double rint(double x);
7676
#endif
7777

7878
#ifndefHAVE_INET_ATON
79-
#if !defined(WIN32)|| (!defined(_MSC_VER)&& !defined(__BORLANDC__))
8079
# include<netinet/in.h>
8180
# include<arpa/inet.h>
82-
#endif
8381
externintinet_aton(constchar*cp,structin_addr*addr);
8482
#endif
8583

‎src/interfaces/libpq/bcc32.mak

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and a Win32 dynamic library libpq.dll with import library libpqdll.lib
55

66
# Borland C++ base install directory goes here
7-
#BCB=d:\Borland\Bcc55
7+
BCB=d:\Borland\Bcc55
88

99
!MESSAGE Building the Win32 DLL and Static Library...
1010
!MESSAGE
@@ -63,13 +63,8 @@ LIB32=tlib.exe
6363
LIB32_FLAGS=
6464
LIB32_OBJS=\
6565
"$(OUTDIR)\win32.obj"\
66-
"$(INTDIR)\getaddrinfo.obj"\
67-
"$(INTDIR)\inet_aton.obj"\
68-
"$(INTDIR)\crypt.obj"\
69-
"$(INTDIR)\path.obj"\
7066
"$(INTDIR)\dllist.obj"\
7167
"$(INTDIR)\md5.obj"\
72-
"$(INTDIR)\ip.obj"\
7368
"$(INTDIR)\fe-auth.obj"\
7469
"$(INTDIR)\fe-connect.obj"\
7570
"$(INTDIR)\fe-exec.obj"\
@@ -82,7 +77,7 @@ LIB32_OBJS= \
8277
"$(INTDIR)\encnames.obj"
8378

8479
RSC=brcc32.exe
85-
RSC_PROJ=-l 0x409-i$(BCB)\include -fo"$(INTDIR)\libpq.res"
80+
RSC_PROJ=/l 0x409/fo"$(INTDIR)\libpq.res"
8681

8782
LINK32=ilink32.exe
8883
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
@@ -91,20 +86,15 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
9186
# ---------------------------------------------------------------------------
9287

9388
.path.obj =$(INTDIR)
94-
.path.c = .;..\..\port;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
89+
.path.c = .;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
9590

9691
# ---------------------------------------------------------------------------
9792

9893
ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
9994

10095
CLEAN :
101-
-@erase"$(INTDIR)\getaddrinfo.obj"
102-
-@erase"$(INTDIR)\inet_aton.obj"
103-
-@erase"$(INTDIR)\crypt.obj"
104-
-@erase"$(INTDIR)\path.obj"
10596
-@erase"$(INTDIR)\dllist.obj"
10697
-@erase"$(INTDIR)\md5.obj"
107-
-@erase"$(INTDIR)\ip.obj"
10898
-@erase"$(INTDIR)\fe-auth.obj"
10999
-@erase"$(INTDIR)\fe-connect.obj"
110100
-@erase"$(INTDIR)\fe-exec.obj"
@@ -135,7 +125,7 @@ CLEAN :
135125
"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
136126
blibpqdll.def,"$(INTDIR)\libpq.res"
137127
!
138-
implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
128+
implib -a "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
139129

140130
"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc
141131
$(RSC) $(RSC_PROJ) libpq.rc

‎src/interfaces/libpq/blibpqdll.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ EXPORTS
9696
_pg_encoding_to_char @ 92
9797
_pg_utf_mblen @ 93
9898
_PQunescapeBytea @ 94
99-
_PQfreemem @ 95
99+
_PQfreeMem @ 95
100100

101101
; Aliases for MS compatible names
102102
PQconnectdb = _PQconnectdb
@@ -193,5 +193,5 @@ EXPORTS
193193
pg_encoding_to_char = _pg_encoding_to_char
194194
pg_utf_mblen = _pg_utf_mblen
195195
PQunescapeBytea = _PQunescapeBytea
196-
PQfreemem =_PQfreemem
196+
PQfreeMem =_PQfreeMem
197197

‎src/interfaces/libpq/fe-connect.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.245 2003/06/12 08:02:57 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.246 2003/06/12 08:11:07 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -49,10 +49,6 @@
4949
#include"libpq/ip.h"
5050
#include"mb/pg_wchar.h"
5151

52-
/* For FNCTL_NONBLOCK */
53-
#if defined(WIN32)|| defined(__BEOS__)
54-
longioctlsocket_ret;
55-
#endif
5652

5753
#definePGPASSFILE ".pgpass"
5854

‎src/interfaces/libpq/fe-misc.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Portions Copyright (c) 1994, Regents of the University of California
2424
*
2525
* IDENTIFICATION
26-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.93 2003/06/12 08:02:57 momjian Exp $
26+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.94 2003/06/12 08:11:07 momjian Exp $
2727
*
2828
*-------------------------------------------------------------------------
2929
*/
@@ -33,11 +33,8 @@
3333
#include<errno.h>
3434
#include<signal.h>
3535
#include<time.h>
36-
37-
#if !defined(_MSC_VER)&& !defined(__BORLANDC__)
3836
#include<netinet/in.h>
3937
#include<arpa/inet.h>
40-
#endif
4138

4239
#ifdefWIN32
4340
#include"win32.h"

‎src/interfaces/libpq/libpqdll.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ EXPORTS
9696
pg_encoding_to_char @ 92
9797
pg_utf_mblen @ 93
9898
PQunescapeBytea @ 94
99-
PQfreemem @ 95
99+
PQfreeMem @ 95
100100

‎src/interfaces/libpq/win32.mak

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,8 @@ OutDir=.\Release
3636
ALL : "$(OUTDIR)\libpq.lib" "$(OUTDIR)\libpq.dll"
3737

3838
CLEAN :
39-
-@erase"$(INTDIR)\getaddrinfo.obj"
40-
-@erase"$(INTDIR)\inet_aton.obj"
41-
-@erase "$(INTDIR)\crypt.obj"
42-
-@erase "$(INTDIR)\path.obj"
4339
-@erase"$(INTDIR)\dllist.obj"
4440
-@erase"$(INTDIR)\md5.obj"
45-
-@erase "$(INTDIR)\ip.obj"
4641
-@erase"$(INTDIR)\fe-auth.obj"
4742
-@erase"$(INTDIR)\fe-connect.obj"
4843
-@erase"$(INTDIR)\fe-exec.obj"
@@ -77,13 +72,8 @@ LIB32=link.exe -lib
7772
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\libpq.lib"
7873
LIB32_OBJS=\
7974
"$(OUTDIR)\win32.obj"\
80-
"$(INTDIR)\getaddrinfo.obj"\
81-
"$(INTDIR)\inet_aton.obj"\
82-
"$(INTDIR)\crypt.obj"\
83-
"$(INTDIR)\path.obj"\
8475
"$(INTDIR)\dllist.obj"\
8576
"$(INTDIR)\md5.obj"\
86-
"$(INTDIR)\ip.obj"\
8777
"$(INTDIR)\fe-auth.obj"\
8878
"$(INTDIR)\fe-connect.obj"\
8979
"$(INTDIR)\fe-exec.obj"\
@@ -122,25 +112,6 @@ LINK32_OBJS= \
122112
$(LINK32_FLAGS) $(LINK32_OBJS)
123113
<<
124114

125-
"$(OUTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
126-
$(CPP) @<<
127-
$(CPP_PROJ) ..\..\port\getaddrinfo.c
128-
<<
129-
130-
"$(OUTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c
131-
$(CPP) @<<
132-
$(CPP_PROJ) ..\..\port\inet_aton.c
133-
<<
134-
135-
"$(OUTDIR)\crypt.obj" : ..\..\port\crypt.c
136-
$(CPP) @<<
137-
$(CPP_PROJ) ..\..\port\crypt.c
138-
<<
139-
140-
"$(OUTDIR)\path.obj" : ..\..\port\path.c
141-
$(CPP) @<<
142-
$(CPP_PROJ) ..\..\port\path.c
143-
<<
144115

145116
"$(OUTDIR)\dllist.obj" : ..\..\backend\lib\dllist.c
146117
$(CPP) @<<
@@ -153,10 +124,6 @@ LINK32_OBJS= \
153124
$(CPP_PROJ) ..\..\backend\libpq\md5.c
154125
<<
155126

156-
"$(OUTDIR)\ip.obj" : ..\..\backend\libpq\ip.c
157-
$(CPP) @<<
158-
$(CPP_PROJ) ..\..\backend\libpq\ip.c
159-
<<
160127

161128
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
162129
$(CPP) @<<

‎src/port/crypt.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,8 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
5050
#include<sys/types.h>
5151
#include<limits.h>
5252
#include<stdlib.h>
53-
54-
#ifdefWIN32
55-
#include<windows.h>
56-
#else
5753
#include<unistd.h>
58-
#endif
54+
#include<windows.h>
5955

6056
staticintdes_setkey(constchar*key);
6157
staticintdes_cipher(constchar*in,char*out,longsalt,intnum_iter);

‎src/port/getaddrinfo.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.5 2003/06/12 08:02:57 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.6 2003/06/12 08:11:07 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

1616
/* This is intended to be used in both frontend and backend, so use c.h */
1717
#include"c.h"
1818

19-
#if !defined(_MSC_VER)&& !defined(__BORLANDC__)
2019
#include<sys/types.h>
2120
#include<sys/socket.h>
2221
#include<netdb.h>
@@ -25,7 +24,6 @@
2524
#ifdefHAVE_UNIX_SOCKETS
2625
#include<sys/un.h>
2726
#endif
28-
#endif
2927

3028
#include"getaddrinfo.h"
3129

‎src/port/inet_aton.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: inet_aton.c,v 1.3 2003/06/12 08:02:57 momjian Exp $
1+
/* $Id: inet_aton.c,v 1.4 2003/06/12 08:11:07 momjian Exp $
22
*
33
*This inet_aton() function was taken from the GNU C library and
44
*incorporated into Postgres for those systems which do not have this
@@ -44,10 +44,8 @@
4444

4545
#include"c.h"
4646

47-
#if !defined(WIN32)|| (!defined(_MSC_VER)&& !defined(__BORLANDC__))
4847
#include<netinet/in.h>
4948
#include<ctype.h>
50-
#endif
5149

5250
/*
5351
* Check whether "cp" is a valid ascii representation

0 commit comments

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