rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attached is the complete diff against current CVS. 

Compiles on BCC 5.5 and VC++ 6.0 (with warnings).

Karl Waclawek
This commit is contained in:
Bruce Momjian 2003-06-12 08:15:29 +00:00
parent dc4ee8a833
commit b14295cfe4
19 changed files with 135 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/libpq/ip.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.14 2003/06/12 08:11:07 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.15 2003/06/12 08:15:28 momjian Exp $
*
* This file and the IPV6 implementation were initially provided by
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
@ -20,6 +20,8 @@
/* This is intended to be used in both frontend and backend, so use c.h */
#include "c.h"
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
@ -33,6 +35,8 @@
#include <arpa/inet.h>
#include <sys/file.h>
#endif
#include "libpq/ip.h"

4
src/backend/utils/mb/encnames.c
View File

@ -2,7 +2,7 @@
* Encoding names and routines for work with it. All
* in this file is shared bedween FE and BE.
*
* $Id: encnames.c,v 1.15 2003/06/12 08:11:07 momjian Exp $
* $Id: encnames.c,v 1.16 2003/06/12 08:15:28 momjian Exp $
*/
#ifdef FRONTEND
#include "postgres_fe.h"
@ -13,7 +13,9 @@
#include "utils/builtins.h"
#endif
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <unistd.h>
#endif
#include "mb/pg_wchar.h"
#include <ctype.h>

19
src/bin/psql/bcc32.mak
View File

@ -1,6 +1,6 @@
# Makefile for Borland C++ 5.5
# Borland C++ base install directory goes here
BCB=d:\Borland\Bcc55
# BCB=d:\Borland\Bcc55
!MESSAGE Building PSQL.EXE ...
!MESSAGE
@ -36,6 +36,7 @@ NULL=nul
!ENDIF
CPP=bcc32.exe
PERL=perl.exe
!IF "$(CFG)" == "Debug"
DEBUG=1
@ -45,13 +46,14 @@ INTDIR=.\Debug
OUTDIR=.\Release
INTDIR=.\Release
!endif
REFDOCDIR=../../../doc/src/sgml/ref
.path.obj = $(INTDIR)
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
ALL : "$(OUTDIR)\psql.exe"
ALL : "sql_help.h" "$(OUTDIR)\psql.exe"
CLEAN :
-@erase "$(INTDIR)\command.obj"
@ -70,6 +72,8 @@ CLEAN :
-@erase "$(INTDIR)\describe.obj"
-@erase "$(INTDIR)\tab-complete.obj"
-@erase "$(INTDIR)\getopt.obj"
-@erase "$(INTDIR)\getopt_long.obj"
-@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\mbprint.obj"
-@erase "$(INTDIR)\psql.ilc"
-@erase "$(INTDIR)\psql.ild"
@ -84,8 +88,8 @@ CLEAN :
USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP
# ---------------------------------------------------------------------------
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq -c -D$(USERDEFINES) -tWM -tWC \
-q -5 -a8 -pc -X -w-use -w-par -w-pia -w-csu -w-aus -w-ccc
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq -c -D$(USERDEFINES) -DFRONTEND \
-tWM -tWC -q -5 -a8 -pc -X -w-use -w-par -w-pia -w-csu -w-aus -w-ccc
!IFDEF DEBUG
CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
@ -122,6 +126,8 @@ LINK32_OBJS= \
describe.obj \
tab-complete.obj \
getopt.obj \
getopt_long.obj \
path.obj \
mbprint.obj
@ -134,3 +140,8 @@ LINK32_OBJS= \
!
getopt.obj : "$(OUTDIR)" ..\..\port\getopt.c
getopt_long.obj : "$(OUTDIR)" ..\..\port\getopt_long.c
path.obj : "$(OUTDIR)" ..\..\port\path.c
"sql_help.h": create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@

4
src/bin/psql/common.c
View File

@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.63 2003/06/12 07:52:51 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.64 2003/06/12 08:15:28 momjian Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@ -48,7 +48,7 @@ typedef struct timeval TimevalStruct;
#else
typedef struct _timeb TimevalStruct;
#define GETTIMEOFDAY(T) _ftime(&T)
#define GETTIMEOFDAY(T) _ftime(T)
#define DIFF_MSEC(T, U) ((((T)->time - (U)->time) * 1000.0 + (T)->millitm - (U)->millitm))
#endif

5
src/bin/psql/print.c
View File

@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.38 2003/06/12 07:52:51 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.39 2003/06/12 08:15:28 momjian Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@ -11,7 +11,10 @@
#include <math.h>
#include <signal.h>
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <unistd.h>
#endif
#ifndef WIN32
#include <sys/ioctl.h> /* for ioctl() */

18
src/bin/psql/win32.mak
View File

@ -35,8 +35,10 @@ CLEAN :
-@erase "$(INTDIR)\describe.obj"
-@erase "$(INTDIR)\tab-complete.obj"
-@erase "$(INTDIR)\getopt.obj"
-@erase "$(INTDIR)\getopt_long.obj"
-@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\mbprint.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\*psql.pch"
-@erase "$(OUTDIR)\psql.exe"
"$(OUTDIR)" :
@ -44,7 +46,7 @@ CLEAN :
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP"
/I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=.\Release/
CPP_SBRS=.
@ -71,6 +73,8 @@ LINK32_OBJS= \
"$(INTDIR)\describe.obj" \
"$(INTDIR)\tab-complete.obj" \
"$(INTDIR)\getopt.obj" \
"$(INTDIR)\getopt_long.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\mbprint.obj" \
"..\..\interfaces\libpq\Release\libpqdll.lib"
@ -84,6 +88,16 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\getopt.c
<<
"$(OUTDIR)\getopt_long.obj" : "$(OUTDIR)" ..\..\port\getopt_long.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt_long.c
<<
"$(OUTDIR)\path.obj" : "$(OUTDIR)" ..\..\port\path.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c
<<
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<

4
src/include/c.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: c.h,v 1.149 2003/06/12 08:11:07 momjian Exp $
* $Id: c.h,v 1.150 2003/06/12 08:15:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -73,7 +73,7 @@
#include <SupportDefs.h>
#endif
#ifdef WIN32
#if defined(WIN32) && !defined(_MSC_VER) && !defined(__BORLANDC__)
/* We have to redefine some system functions after they are included above */
#include "pg_config_os.h"
#endif

4
src/include/getaddrinfo.h
View File

@ -16,15 +16,17 @@
*
* Copyright (c) 2003, PostgreSQL Global Development Group
*
* $Id: getaddrinfo.h,v 1.5 2003/06/12 08:11:07 momjian Exp $
* $Id: getaddrinfo.h,v 1.6 2003/06/12 08:15:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef GETADDRINFO_H
#define GETADDRINFO_H
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <sys/socket.h>
#include <netdb.h>
#endif
#ifndef HAVE_STRUCT_ADDRINFO

4
src/include/pg_config.h.win32
View File

@ -21,6 +21,10 @@
#define HAVE_ATEXIT
#define HAVE_MEMMOVE
#ifdef __BORLANDC__
#define HAVE_RANDOM
#endif
/* use _snprintf instead of snprintf */
#define HAVE_DECL_SNPRINTF 1
#define snprintf _snprintf

4
src/include/port.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: port.h,v 1.5 2003/06/12 08:11:07 momjian Exp $
* $Id: port.h,v 1.6 2003/06/12 08:15:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -76,8 +76,10 @@ extern double rint(double x);
#endif
#ifndef HAVE_INET_ATON
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
# include <netinet/in.h>
# include <arpa/inet.h>
#endif
extern int inet_aton(const char *cp, struct in_addr * addr);
#endif

22
src/interfaces/libpq/bcc32.mak
View File

@ -4,7 +4,7 @@
# and a Win32 dynamic library libpq.dll with import library libpqdll.lib
# Borland C++ base install directory goes here
BCB=d:\Borland\Bcc55
# BCB=d:\Borland\Bcc55
!MESSAGE Building the Win32 DLL and Static Library...
!MESSAGE
@ -63,9 +63,16 @@ LIB32=tlib.exe
LIB32_FLAGS=
LIB32_OBJS= \
"$(OUTDIR)\win32.obj" \
"$(INTDIR)\getaddrinfo.obj" \
"$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\dllist.obj" \
"$(INTDIR)\md5.obj" \
"$(INTDIR)\ip.obj" \
"$(INTDIR)\fe-auth.obj" \
"$(INTDIR)\fe-protocol2.obj" \
"$(INTDIR)\fe-protocol3.obj" \
"$(INTDIR)\fe-connect.obj" \
"$(INTDIR)\fe-exec.obj" \
"$(INTDIR)\fe-lobj.obj" \
@ -77,7 +84,7 @@ LIB32_OBJS= \
"$(INTDIR)\encnames.obj"
RSC=brcc32.exe
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
LINK32=ilink32.exe
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
@ -86,16 +93,23 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
# ---------------------------------------------------------------------------
.path.obj = $(INTDIR)
.path.c = .;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
.path.c = .;..\..\port;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
# ---------------------------------------------------------------------------
ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj"
-@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj"
-@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\dllist.obj"
-@erase "$(INTDIR)\md5.obj"
-@erase "$(INTDIR)\ip.obj"
-@erase "$(INTDIR)\fe-auth.obj"
-@erase "$(INTDIR)\fe-protocol2.obj"
-@erase "$(INTDIR)\fe-protocol3.obj"
-@erase "$(INTDIR)\fe-connect.obj"
-@erase "$(INTDIR)\fe-exec.obj"
-@erase "$(INTDIR)\fe-lobj.obj"
@ -125,7 +139,7 @@ CLEAN :
"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
blibpqdll.def,"$(INTDIR)\libpq.res"
!
implib -a "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc
$(RSC) $(RSC_PROJ) libpq.rc

4
src/interfaces/libpq/blibpqdll.def
View File

@ -96,7 +96,7 @@ EXPORTS
_pg_encoding_to_char @ 92
_pg_utf_mblen @ 93
_PQunescapeBytea @ 94
_PQfreeMem @ 95
_PQfreemem @ 95
; Aliases for MS compatible names
PQconnectdb = _PQconnectdb
@ -193,5 +193,5 @@ EXPORTS
pg_encoding_to_char = _pg_encoding_to_char
pg_utf_mblen = _pg_utf_mblen
PQunescapeBytea = _PQunescapeBytea
PQfreeMem = _PQfreeMem
PQfreemem = _PQfreemem

6
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.246 2003/06/12 08:11:07 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.247 2003/06/12 08:15:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -49,6 +49,10 @@
#include "libpq/ip.h"
#include "mb/pg_wchar.h"
/* For FNCTL_NONBLOCK */
#if defined(WIN32) || defined(__BEOS__)
long ioctlsocket_ret;
#endif
#define PGPASSFILE ".pgpass"

5
src/interfaces/libpq/fe-misc.c
View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.94 2003/06/12 08:11:07 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.95 2003/06/12 08:15:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -33,8 +33,11 @@
#include <errno.h>
#include <signal.h>
#include <time.h>
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <netinet/in.h>
#include <arpa/inet.h>
#endif
#ifdef WIN32
#include "win32.h"

2
src/interfaces/libpq/libpqdll.def
View File

@ -96,5 +96,5 @@ EXPORTS
pg_encoding_to_char @ 92
pg_utf_mblen @ 93
PQunescapeBytea @ 94
PQfreeMem @ 95
PQfreemem @ 95

37
src/interfaces/libpq/win32.mak
View File

@ -36,9 +36,16 @@ OutDir=.\Release
ALL : "$(OUTDIR)\libpq.lib" "$(OUTDIR)\libpq.dll"
CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj"
-@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj"
-@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\dllist.obj"
-@erase "$(INTDIR)\md5.obj"
-@erase "$(INTDIR)\ip.obj"
-@erase "$(INTDIR)\fe-auth.obj"
-@erase "$(INTDIR)\fe-protocol2.obj"
-@erase "$(INTDIR)\fe-protocol3.obj"
-@erase "$(INTDIR)\fe-connect.obj"
-@erase "$(INTDIR)\fe-exec.obj"
-@erase "$(INTDIR)\fe-lobj.obj"
@ -72,9 +79,16 @@ LIB32=link.exe -lib
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\libpq.lib"
LIB32_OBJS= \
"$(OUTDIR)\win32.obj" \
"$(INTDIR)\getaddrinfo.obj" \
"$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\dllist.obj" \
"$(INTDIR)\md5.obj" \
"$(INTDIR)\ip.obj" \
"$(INTDIR)\fe-auth.obj" \
"$(INTDIR)\fe-protocol2.obj" \
"$(INTDIR)\fe-protocol3.obj" \
"$(INTDIR)\fe-connect.obj" \
"$(INTDIR)\fe-exec.obj" \
"$(INTDIR)\fe-lobj.obj" \
@ -112,6 +126,25 @@ LINK32_OBJS= \
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
"$(OUTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getaddrinfo.c
<<
"$(OUTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\inet_aton.c
<<
"$(OUTDIR)\crypt.obj" : ..\..\port\crypt.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\crypt.c
<<
"$(OUTDIR)\path.obj" : ..\..\port\path.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c
<<
"$(OUTDIR)\dllist.obj" : ..\..\backend\lib\dllist.c
$(CPP) @<<
@ -124,6 +157,10 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\backend\libpq\md5.c
<<
"$(OUTDIR)\ip.obj" : ..\..\backend\libpq\ip.c
$(CPP) @<<
$(CPP_PROJ) ..\..\backend\libpq\ip.c
<<
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
$(CPP) @<<

6
src/port/crypt.c
View File

@ -50,8 +50,12 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
#include <sys/types.h>
#include <limits.h>
#include <stdlib.h>
#include <unistd.h>
#ifdef WIN32
#include <windows.h>
#else
#include <unistd.h>
#endif
static int des_setkey(const char *key);
static int des_cipher(const char *in, char *out, long salt, int num_iter);

4
src/port/getaddrinfo.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.6 2003/06/12 08:11:07 momjian Exp $
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.7 2003/06/12 08:15:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -16,6 +16,7 @@
/* This is intended to be used in both frontend and backend, so use c.h */
#include "c.h"
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
@ -24,6 +25,7 @@
#ifdef HAVE_UNIX_SOCKETS
#include <sys/un.h>
#endif
#endif
#include "getaddrinfo.h"

4
src/port/inet_aton.c
View File

@ -1,4 +1,4 @@
/* $Id: inet_aton.c,v 1.4 2003/06/12 08:11:07 momjian Exp $
/* $Id: inet_aton.c,v 1.5 2003/06/12 08:15:29 momjian Exp $
*
* This inet_aton() function was taken from the GNU C library and
* incorporated into Postgres for those systems which do not have this
@ -44,8 +44,10 @@
#include "c.h"
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <netinet/in.h>
#include <ctype.h>
#endif
/*
* Check whether "cp" is a valid ascii representation