mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow Borland CC to compile libpq and psql.

Browse Source 
Backpatch to 8.2.X.

L Bayuk
This commit is contained in:
Bruce Momjian 2007-01-11 02:42:31 +00:00
parent 945d0b4b09
commit a5ec2ec77a
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/port/win32.h
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.64 2007/01/02 21:25:50 momjian Exp $ */ /* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.65 2007/01/11 02:42:31 momjian Exp $ */
#if defined(_MSC_VER) || defined(__BORLANDC__) #if defined(_MSC_VER) || defined(__BORLANDC__)
#define WIN32_ONLY_COMPILER #define WIN32_ONLY_COMPILER
@ -17,7 +17,9 @@
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <direct.h> #include <direct.h>
#ifndef __BORLANDC__
#include <sys/utime.h> /* for non-unicode version */ #include <sys/utime.h> /* for non-unicode version */
#endif
#undef near #undef near
/* Must be here to avoid conflicting with prototype in windows.h */ /* Must be here to avoid conflicting with prototype in windows.h */
@ -149,8 +151,10 @@ int semop(int semId, struct sembuf * sops, int flag);
#define SIGTTIN 21 #define SIGTTIN 21
#define SIGTTOU 22 /* Same as SIGABRT -- no problem, I hope */ #define SIGTTOU 22 /* Same as SIGABRT -- no problem, I hope */
#define SIGWINCH 28 #define SIGWINCH 28
#ifndef __BORLANDC__
#define SIGUSR1 30 #define SIGUSR1 30
#define SIGUSR2 31 #define SIGUSR2 31
#endif
struct timezone struct timezone
{ {
@ -259,8 +263,10 @@ extern void _dosmaperr(unsigned long);
/* Things that exist in MingW headers, but need to be added to MSVC */ /* Things that exist in MingW headers, but need to be added to MSVC */
#ifdef WIN32_ONLY_COMPILER #ifdef WIN32_ONLY_COMPILER
#ifndef __BORLANDC__
typedef long ssize_t; typedef long ssize_t;
typedef unsigned short mode_t; typedef unsigned short mode_t;
#endif
/* /*
* Certain "standard edition" versions of MSVC throw a warning * Certain "standard edition" versions of MSVC throw a warning
@ -271,6 +277,7 @@ typedef unsigned short mode_t;
#define inline __inline #define inline __inline
#define __inline__ __inline #define __inline__ __inline
#ifndef __BORLANDC__
#define _S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC) #define _S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC)
#define _S_IXUSR _S_IEXEC #define _S_IXUSR _S_IEXEC
#define _S_IWUSR _S_IWRITE #define _S_IWUSR _S_IWRITE
@ -280,6 +287,7 @@ typedef unsigned short mode_t;
#define S_IXUSR _S_IXUSR #define S_IXUSR _S_IXUSR
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
#endif
#define F_OK 0 #define F_OK 0
#define W_OK 2 #define W_OK 2

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

@ -76,7 +76,6 @@ ALL : config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
CLEAN : CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj" -@erase "$(INTDIR)\getaddrinfo.obj"
-@erase "$(INTDIR)\pgstrcasecmp.obj" -@erase "$(INTDIR)\pgstrcasecmp.obj"
-@erase "$(INTDIR)\strlcpy.obj"
-@erase "$(INTDIR)\thread.obj" -@erase "$(INTDIR)\thread.obj"
-@erase "$(INTDIR)\inet_aton.obj" -@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj" -@erase "$(INTDIR)\crypt.obj"
@ -99,6 +98,8 @@ CLEAN :
-@erase "$(INTDIR)\wchar.obj" -@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\encnames.obj" -@erase "$(INTDIR)\encnames.obj"
-@erase "$(INTDIR)\pthread-win32.obj" -@erase "$(INTDIR)\pthread-win32.obj"
-@erase "$(INTDIR)\snprintf.obj"
-@erase "$(INTDIR)\strlcpy.obj"
-@erase "$(OUTDIR)\$(OUTFILENAME).lib" -@erase "$(OUTDIR)\$(OUTFILENAME).lib"
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-@erase "$(OUTDIR)\libpq.res" -@erase "$(OUTDIR)\libpq.res"
@ -113,7 +114,6 @@ LIB32_OBJS= \
"$(INTDIR)\win32.obj" \ "$(INTDIR)\win32.obj" \
"$(INTDIR)\getaddrinfo.obj" \ "$(INTDIR)\getaddrinfo.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \ "$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\strlcpy.obj" \
"$(INTDIR)\thread.obj" \ "$(INTDIR)\thread.obj" \
"$(INTDIR)\inet_aton.obj" \ "$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \ "$(INTDIR)\crypt.obj" \
@ -133,6 +133,8 @@ LIB32_OBJS= \
"$(INTDIR)\pqsignal.obj" \ "$(INTDIR)\pqsignal.obj" \
"$(INTDIR)\wchar.obj" \ "$(INTDIR)\wchar.obj" \
"$(INTDIR)\encnames.obj" \ "$(INTDIR)\encnames.obj" \
"$(INTDIR)\snprintf.obj" \
"$(INTDIR)\strlcpy.obj" \
"$(INTDIR)\pthread-win32.obj" "$(INTDIR)\pthread-win32.obj"
@ -162,7 +164,7 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
$(LINK32_FLAGS) + $(LINK32_FLAGS) +
c0d32.obj $(LINK32_OBJS), + c0d32.obj $(LINK32_OBJS), +
$@,, + $@,, +
"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, + "$(OUTDIR)\blibpq.lib" import32.lib cw32mt.lib, +
blibpqdll.def,"$(INTDIR)\libpq.res" blibpqdll.def,"$(INTDIR)\libpq.res"
<< <<
implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@ implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
@ -187,11 +189,6 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<< <<
"$(INTDIR)\strlcpy.obj" : ..\..\port\strlcpy.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\strlcpy.c
<<
"$(INTDIR)\thread.obj" : ..\..\port\thread.c "$(INTDIR)\thread.obj" : ..\..\port\thread.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\thread.c $(CPP_PROJ) ..\..\port\thread.c
@ -233,5 +230,16 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
$(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c $(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
<< <<
"$(INTDIR)\snprintf.obj" : ..\..\port\snprintf.c
$(CPP) @<<
$(CPP_PROJ) /I"." ..\..\port\snprintf.c
<<
"$(INTDIR)\strlcpy.obj" : ..\..\port\strlcpy.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\strlcpy.c
<<
.c.obj: .c.obj:
$(CPP) $(CPP_PROJ) $< $(CPP) $(CPP_PROJ) $<

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

@ -74,8 +74,6 @@ CLEAN :
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-@erase "$(OUTDIR)\libpq.res" -@erase "$(OUTDIR)\libpq.res"
-@erase "$(OUTDIR)\$(OUTFILENAME).dll" -@erase "$(OUTDIR)\$(OUTFILENAME).dll"
# -@erase "*.pch"
# -@erase "$(OUTDIR)\libpq.pch"
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
-@erase "$(INTDIR)\pg_config_paths.h" -@erase "$(INTDIR)\pg_config_paths.h"