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

Backpatch BCC compile changes to 8.0.X for psql.

This commit is contained in:
Bruce Momjian 2005-04-29 13:42:21 +00:00
parent 18b5ef5a76
commit 7cebfdf211
9 changed files with 246 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,17 @@
# Makefile for Borland C++ 5.5
# Borland C++ base install directory goes here
# BCB=d:\Borland\Bcc55
# BCB=c:\Borland\Bcc55
!IF "$(BCB)" == ""
!MESSAGE You must edit bcc32.mak and define BCB at the top
!ERROR missing BCB
!ENDIF
!IF "$(__NMAKE__)" == ""
!MESSAGE You must use the -N compatibility flag, e.g. make -N -f bcc32.make
!ERROR missing -N
!ENDIF
!MESSAGE Building PSQL.EXE ...
!MESSAGE
@ -19,7 +30,7 @@ CFG=Release
!MESSAGE You can specify a configuration when running MAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE make -DCFG=[Release | Debug] /f bcc32.mak
!MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@ -49,10 +60,29 @@ INTDIR=.\Release
!endif
REFDOCDIR=../../../doc/src/sgml/ref
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32 \
-c -D$(USERDEFINES) -DFRONTEND -n"$(INTDIR)" -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
LIBPG_DIR = Debug
!ELSE
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
LIBPG_DIR = Release
!ENDIF
!IFDEF DLL_LIBS
CPP_PROJ = $(CPP_PROJ) -D_RTLDLL
LIBRARIES = cw32mti.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpqdll.lib
!ELSE
CPP_PROJ = $(CPP_PROJ) -DBCC32_STATIC
LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib
!ENDIF
.path.obj = $(INTDIR)
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP
ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
@ -86,69 +116,52 @@ CLEAN :
-@erase "$(OUTDIR)\psql.exe"
-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
LINK32=ilink32.exe
LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v
LINK32_OBJS= \
"$(INTDIR)\command.obj" \
"$(INTDIR)\common.obj" \
"$(INTDIR)\copy.obj" \
"$(INTDIR)\describe.obj" \
"$(INTDIR)\help.obj" \
"$(INTDIR)\input.obj" \
"$(INTDIR)\large_obj.obj" \
"$(INTDIR)\mainloop.obj" \
"$(INTDIR)\mbprint.obj" \
"$(INTDIR)\print.obj" \
"$(INTDIR)\prompt.obj" \
"$(INTDIR)\psqlscan.obj" \
"$(INTDIR)\startup.obj" \
"$(INTDIR)\stringutils.obj" \
"$(INTDIR)\tab-complete.obj" \
"$(INTDIR)\variables.obj" \
"$(INTDIR)\exec.obj" \
"$(INTDIR)\getopt.obj" \
"$(INTDIR)\getopt_long.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\sprompt.obj"
!IFDEF DEBUG
LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\blibpqddll.lib"
!ELSE
LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\blibpqdll.lib"
!ENDIF
"..\..\port\pg_config_paths.h": win32.mak
echo #define PGBINDIR "" >$@
echo #define PGSHAREDIR "" >>$@
echo #define SYSCONFDIR "" >>$@
echo #define INCLUDEDIR "" >>$@
echo #define PKGINCLUDEDIR "" >>$@
echo #define INCLUDEDIRSERVER "" >>$@
echo #define LIBDIR "" >>$@
echo #define PKGLIBDIR "" >>$@
echo #define LOCALEDIR "" >>$@
echo \#define PGBINDIR "" >$@
echo \#define PGSHAREDIR "" >>$@
echo \#define SYSCONFDIR "" >>$@
echo \#define INCLUDEDIR "" >>$@
echo \#define PKGINCLUDEDIR "" >>$@
echo \#define INCLUDEDIRSERVER "" >>$@
echo \#define LIBDIR "" >>$@
echo \#define PKGLIBDIR "" >>$@
echo \#define LOCALEDIR "" >>$@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP
# ---------------------------------------------------------------------------
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32 \
-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
LIBPG_DIR = Debug
!ELSE
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
LIBPG_DIR = Release
!ENDIF
!IFDEF DLL_LIBS
CPP_PROJ = $(CPP_PROJ) -D_RTLDLL
LIBRARIES = cw32mti.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpqdll.lib
!ELSE
CPP_PROJ = $(CPP_PROJ) -DBCC32_STATIC
LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib
!ENDIF
LINK32=ilink32.exe
LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v
LINK32_OBJS= \
command.obj \
common.obj \
copy.obj \
describe.obj \
help.obj \
input.obj \
large_obj.obj \
mainloop.obj \
mbprint.obj
print.obj \
prompt.obj \
startup.obj \
stringutils.obj \
tab-complete.obj \
variables.obj \
exec.obj \
getopt.obj \
getopt_long.obj \
path.obj \
pgstrcasecmp.obj \
sprompt.obj \
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS)
$(LINK32) @&&!
$(LINK32_FLAGS) +
@ -157,15 +170,42 @@ LINK32_OBJS= \
import32.lib $(LIBRARIES),,
!
exec.obj : "$(OUTDIR)" ..\..\port\exec.c
getopt.obj : "$(OUTDIR)" ..\..\port\getopt.c
getopt_long.obj : "$(OUTDIR)" ..\..\port\getopt_long.c
path.obj : "$(OUTDIR)" ..\..\port\path.c
pgstrcasecmp.obj : "$(OUTDIR)" ..\..\port\pgstrcasecmp.c
sprompt.obj : "$(OUTDIR)" ..\..\port\sprompt.c
"$(INTDIR)\exec.obj" : ..\..\port\exec.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\exec.c
<<
"$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt.c
<<
"$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt_long.c
<<
"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c
<<
"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<<
"$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\sprompt.c
<<
"sql_help.h": create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
psqlscan.c : psqlscan.l
$(FLEX) -Cfe -opsqlscan.c psqlscan.l
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<

6
src/bin/psql/command.c
View File

@ -3,11 +3,15 @@
*
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.142 2005/03/16 21:27:23 momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.143 2005/04/29 13:42:20 momjian Exp $
*/
#include "postgres_fe.h"
#include "command.h"
#ifdef WIN32_CLIENT_ONLY /* needed for BCC */
#undef mkdir
#endif
#include <errno.h>
#include <ctype.h>
#ifdef HAVE_PWD_H

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

@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.113 2005/02/22 04:40:58 momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.114 2005/04/29 13:42:20 momjian Exp $
*/
#include "postgres_fe.h"
@ -19,7 +19,7 @@
#include "getopt_long.h"
#ifndef HAVE_INT_OPTRESET
int optreset;
extern int optreset;
#endif
#include <locale.h>

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

@ -26,6 +26,14 @@ INTDIR=.\Release
REFDOCDIR= ../../../doc/src/sgml/ref
CPP_PROJ=/nologo $(OPT) /W3 /GX /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
/D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=$(INTDIR)/
CPP_SBRS=.
ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN :
@ -55,28 +63,6 @@ CLEAN :
-@erase "$(OUTDIR)\psql.exe"
-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
"..\..\port\pg_config_paths.h": win32.mak
echo #define PGBINDIR "" >$@
echo #define PGSHAREDIR "" >>$@
echo #define SYSCONFDIR "" >>$@
echo #define INCLUDEDIR "" >>$@
echo #define PKGINCLUDEDIR "" >>$@
echo #define INCLUDEDIRSERVER "" >>$@
echo #define LIBDIR "" >>$@
echo #define PKGLIBDIR "" >>$@
echo #define LOCALEDIR "" >>$@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo $(OPT) /W3 /GX /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
/D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=$(INTDIR)/
CPP_SBRS=.
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
@ -104,13 +90,28 @@ LINK32_OBJS= \
"$(INTDIR)\getopt_long.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\sprompt.obj" \
"$(INTDIR)\sprompt.obj"
!IFDEF DEBUG
"..\..\interfaces\libpq\Debug\libpqddll.lib"
LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib"
!ELSE
"..\..\interfaces\libpq\Release\libpqdll.lib"
LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
!ENDIF
"..\..\port\pg_config_paths.h": win32.mak
echo \#define PGBINDIR "" >$@
echo \#define PGSHAREDIR "" >>$@
echo \#define SYSCONFDIR "" >>$@
echo \#define INCLUDEDIR "" >>$@
echo \#define PKGINCLUDEDIR "" >>$@
echo \#define INCLUDEDIRSERVER "" >>$@
echo \#define LIBDIR "" >>$@
echo \#define PKGLIBDIR "" >>$@
echo \#define LOCALEDIR "" >>$@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
@ -121,17 +122,17 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\exec.c
<<
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c
"$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt.c
<<
"$(OUTDIR)\getopt_long.obj" : "$(OUTDIR)" ..\..\port\getopt_long.c
"$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt_long.c
<<
"$(OUTDIR)\path.obj" : "$(OUTDIR)" ..\..\port\path.c
"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c
<<
@ -141,23 +142,20 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<<
"$(OUTDIR)\sprompt.obj" : "$(OUTDIR)" ..\..\port\sprompt.c
"$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\sprompt.c
<<
"sql_help.h" : create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
psqlscan.c : psqlscan.l
$(FLEX) -Cfe -opsqlscan.c psqlscan.l
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
sql_help.h : create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
psqlscan.c: psqlscan.l
$(FLEX) -Cfe -opsqlscan.c psqlscan.l

5
src/interfaces/libpq/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.131 2005/03/25 00:34:28 tgl Exp $
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.132 2005/04/29 13:42:21 momjian Exp $
#
#-------------------------------------------------------------------------
@ -145,7 +145,8 @@ uninstall: uninstall-lib
rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(DESTDIR)$(includedir_internal)/pqexpbuffer.h
clean distclean: clean-lib
rm -f $(OBJS) crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c md5.c ip.c encnames.c wchar.c pthread.h
# pg_config_paths.h might be left over from a Win32 client-only build
rm -f $(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c md5.c ip.c encnames.c wchar.c pthread.h
maintainer-clean: distclean
rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def $(srcdir)/libpq.rc

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

@ -4,7 +4,17 @@
# and a Win32 dynamic library libpq.dll with import library libpqdll.lib
# Borland C++ base install directory goes here
# BCB=d:\Borland\Bcc55
# BCB=c:\Borland\Bcc55
!IF "$(BCB)" == ""
!MESSAGE You must edit bcc32.mak and define BCB at the top
!ERROR misssing BCB
!ENDIF
!IF "$(__NMAKE__)" == ""
!MESSAGE You must use the -N compatibility flag, e.g. make -N -f bcc32.make
!ERROR missing -N
!ENDIF
!MESSAGE Building the Win32 DLL and Static Library...
!MESSAGE
@ -22,7 +32,7 @@ CFG=Release
!MESSAGE You can specify a configuration when running MAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE make -DCFG=[Release | Debug] /f bcc32.mak
!MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@ -52,7 +62,7 @@ OUTFILENAME=blibpq
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
CPP=bcc32.exe
CPP_PROJ = -I$(BCB)\include;..\..\include -WD -c -D$(USERDEFINES) -tWM \
CPP_PROJ = -I$(BCB)\include;..\..\include -n"$(INTDIR)" -WD -c -D$(USERDEFINES) -tWM \
-a8 -X -w-use -w-par -w-pia -w-csu -w-aus -w-ccc
!IFDEF DEBUG
@ -61,6 +71,8 @@ CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
!endif
ALL : config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj"
-@erase "$(INTDIR)\pgstrcasecmp.obj"
@ -93,6 +105,7 @@ CLEAN :
-@erase "$(OUTDIR)\$(OUTFILENAME).tds"
-@erase "$(INTDIR)\pg_config_paths.h"
LIB32=tlib.exe
LIB32_FLAGS=
LIB32_OBJS= \
@ -121,15 +134,6 @@ LIB32_OBJS= \
"$(INTDIR)\pthread-win32.obj"
RSC=brcc32.exe
RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
LINK32=ilink32.exe
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
@ -138,85 +142,91 @@ config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
pthread.h: pthread.h.win32
copy pthread.h.win32 pthread.h
pg_config_paths.h: win32.mak
echo #define SYSCONFDIR "" > pg_config_paths.h
pg_config_paths.h: bcc32.mak
echo \#define SYSCONFDIR "" > pg_config_paths.h
"$(OUTDIR)" :
@if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
/* @&&! is a Response file, http://users.deltacomm.com/edmulroy/howto8.htm */
RSC=brcc32.exe
RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
LINK32=ilink32.exe
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
# @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm
"$(OUTDIR)\blibpq.dll": "$(OUTDIR)\blibpq.lib" $(LINK32_OBJS) "$(INTDIR)\libpq.res" blibpqdll.def
$(LINK32) @&&!
$(LINK32) @<<
$(LINK32_FLAGS) +
c0d32.obj $(LINK32_OBJS), +
$@,, +
"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
blibpqdll.def,"$(INTDIR)\libpq.res"
!
<<
implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc
$(RSC) $(RSC_PROJ) libpq.rc
"$(OUTDIR)\blibpq.lib": $(LIB32_OBJS)
$(LIB32) $@ @&&!
$(LIB32) $@ @<<
+-"$(**: =" &^
+-")"
!
<<
"$(INTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getaddrinfo.c
!
<<
"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
!
<<
"$(INTDIR)\thread.obj" : ..\..\port\thread.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\port\thread.c
!
<<
"$(INTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\port\inet_aton.c
!
<<
"$(INTDIR)\crypt.obj" : ..\..\port\crypt.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\port\crypt.c
!
<<
"$(INTDIR)\noblock.obj" : ..\..\port\noblock.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\port\noblock.c
!
<<
"$(INTDIR)\md5.obj" : ..\..\backend\libpq\md5.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\backend\libpq\md5.c
!
<<
"$(INTDIR)\ip.obj" : ..\..\backend\libpq\ip.c
$(CPP) @&&!
$(CPP) @<<
$(CPP_PROJ) ..\..\backend\libpq\ip.c
!
<<
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
$(CPP) @&&!
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
!
$(CPP) @<<
$(CPP_PROJ) /I"." ..\..\backend\utils\mb\wchar.c
<<
"$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
$(CPP) @&&!
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c
!
$(CPP) @<<
$(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
<<
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
$(CPP) $(CPP_PROJ) $<

4
src/interfaces/libpq/fe-exec.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.166 2004/12/31 22:03:50 pgsql Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.167 2005/04/29 13:42:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -2294,7 +2294,7 @@ PQisnonblocking(const PGconn *conn)
int
PQflush(PGconn *conn)
{
return (pqFlush(conn));
return pqFlush(conn);
}

4
src/interfaces/libpq/pthread-win32.c
View File

@ -5,14 +5,14 @@
*
* Copyright (c) 2004-2005, PostgreSQL Global Development Group
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.4 2005/01/01 20:44:31 tgl Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.5 2005/04/29 13:42:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <windows.h>
#include <pthread.h>
#include "pthread.h"
HANDLE
pthread_self()

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

@ -78,35 +78,6 @@ CLEAN :
-@erase "$(INTDIR)\pg_config_paths.h"
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
copy ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h
pthread.h: pthread.h.win32
copy pthread.h.win32 pthread.h
pg_config_paths.h: win32.mak
echo #define SYSCONFDIR "" > pg_config_paths.h
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /I. /D "FRONTEND" $(DEBUGDEF) /D\
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
!IFDEF USE_SSL
CPP_PROJ=$(CPP_PROJ) /D USE_SSL
SSL_LIBS=ssleay32.lib libeay32.lib gdi32.lib
!ENDIF
!IFDEF ENABLE_THREAD_SAFETY
CPP_PROJ=$(CPP_PROJ) /D ENABLE_THREAD_SAFETY
!ENDIF
CPP_SBRS=.
LIB32=link.exe -lib
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib"
LIB32_OBJS= \
@ -115,7 +86,7 @@ LIB32_OBJS= \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\thread.obj" \
"$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \
"$(INTDIR)\crypt.obj" \
"$(INTDIR)\noblock.obj" \
"$(INTDIR)\md5.obj" \
"$(INTDIR)\ip.obj" \
@ -135,6 +106,35 @@ LIB32_OBJS= \
"$(INTDIR)\pthread-win32.obj"
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
copy ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h
pthread.h: pthread.h.win32
copy pthread.h.win32 pthread.h
pg_config_paths.h: win32.mak
echo \#define SYSCONFDIR "" > pg_config_paths.h
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /I. /D "FRONTEND" $(DEBUGDEF) /D\
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
!IFDEF USE_SSL
CPP_PROJ=$(CPP_PROJ) /D USE_SSL
SSL_LIBS=ssleay32.lib libeay32.lib gdi32.lib
!ENDIF
!IFDEF ENABLE_THREAD_SAFETY
CPP_PROJ=$(CPP_PROJ) /D ENABLE_THREAD_SAFETY
!ENDIF
CPP_SBRS=.
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
LINK32=link.exe
@ -148,7 +148,7 @@ LINK32_OBJS= \
"$(OUTDIR)\libpq.res"
/* @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm */
# @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm
"$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@ -206,42 +206,14 @@ LINK32_OBJS= \
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
$(CPP) @<<
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
$(CPP_PROJ) /I"." ..\..\backend\utils\mb\wchar.c
<<
"$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
$(CPP) @<<
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c
$(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
<<
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c.obj:
$(CPP) $(CPP_PROJ) $<