From: Bruce Momjian Date: Fri, 29 Apr 2005 13:42:24 +0000 (+0000) Subject: Backpatch BCC compile changes to 8.0.X for psql. X-Git-Tag: REL8_0_3~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f9d19cc23927c16515e85b1a2ec139f1af0e0d8;p=thirdparty%2Fpostgresql.git Backpatch BCC compile changes to 8.0.X for psql. --- diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak index 3c3c9372dd0..98bd4045782 100644 --- a/src/bin/psql/bcc32.mak +++ b/src/bin/psql/bcc32.mak @@ -1,7 +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 @@ -20,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 @@ -50,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" @@ -87,80 +116,58 @@ 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)" - -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_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 \ + "$(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 - "..\..\interfaces\libpq\Debug\libpqddll.lib" +LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\blibpqddll.lib" !ELSE - "..\..\interfaces\libpq\Release\libpqdll.lib" +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 "" >>$@ + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" "$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS) $(LINK32) @&&! $(LINK32_FLAGS) + c0x32.obj $(LINK32_OBJS), + $@,, + - import32.lib $(LIBRARIES) + import32.lib $(LIBRARIES),, ! "$(INTDIR)\exec.obj" : ..\..\port\exec.c @@ -168,17 +175,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 << @@ -188,7 +195,7 @@ 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 << @@ -198,3 +205,7 @@ LINK32_OBJS= \ psqlscan.c : psqlscan.l $(FLEX) -Cfe -opsqlscan.c psqlscan.l + +.c.obj: + $(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $< + diff --git a/src/interfaces/libpq/pthread-win32.c b/src/interfaces/libpq/pthread-win32.c index 838840af21e..bdd27eef64d 100644 --- a/src/interfaces/libpq/pthread-win32.c +++ b/src/interfaces/libpq/pthread-win32.c @@ -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.4.4.1 2005/04/29 13:42:24 momjian Exp $ * *------------------------------------------------------------------------- */ #include -#include +#include "pthread.h" HANDLE pthread_self()