rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 18:11:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
62b532b736
postgresql/src/interfaces/libpq/win32.h

44 lines
940 B
C
Raw Normal View History

Hello, i noticed that win32 native stopped working/compiling after the SSL merge . So i took the opportunity to fix some stuff: 1. Made the thing compile (typos & needed definitions) with the new pqsecure_* s tuff, and added fe-secure.c to the win32.mak makefile. 2. Fixed some MULTIBYTE compile errors (when building without MB support). 3. Made it do that you can build with debug info: "nmake -f win32.mak DEBUG=1". 4. Misc small compiler speedup changes. The resulting .dll has been tested in production, and everything seems ok. I CC:ed -hackers because i'm not sure about two things: 1. In libpq-int.h I typedef ssize_t as an int because Visual C (v6.0) doesn't de fine ssize_t. Is that ok, or is there any standard about what type should be use d for ssize_t? 2. To keep the .dll api consistent regarding MULTIBYTE I just return -1 in fe-connect.c:PQsetClientEncoding() instead of taking away the whole function. I wonder if i should do any compares with the conn->client_encoding and return 0 if not hing would have changed (if so how do i check that?). Regards Magnus Naeslund
2002-07-20 07:43:31 +02:00
#ifndef __win32_h_included
#define __win32_h_included
Hello! Through some minor changes, I have been able to compile the libpq client libraries on the Win32 platform. Since the libpq communications part has been rewritten, this has become much easier. Enclosed is a patch that will allow at least Microsoft Visual C++ to compile libpq into both a static and a dynamic library. I will take a look at porting the psql frontend as well, but I figured it was a good idea to send in these patches first - so no major changes are done to the files before it gets applied (if it does). Regards, Magnus Hagander
1998-07-03 06:24:16 +02:00
/*
* strcasecmp() is not in Windows, stricmp is, though
*/
#define strcasecmp(a,b) stricmp(a,b)
The following is required in order to make beta1 compile on the Win32 platform (psql and libpq): The file "config.h.win32" in the include\ directory (from my patch from 2000-01-18) is missing from the tree. It needs to be put back :-) The following patch has to be applied in the interfaces\libpq directory. //Magnus
2000-02-24 16:53:12 +01:00
#define strncasecmp(a,b,c) _strnicmp(a,b,c)
Hello! Through some minor changes, I have been able to compile the libpq client libraries on the Win32 platform. Since the libpq communications part has been rewritten, this has become much easier. Enclosed is a patch that will allow at least Microsoft Visual C++ to compile libpq into both a static and a dynamic library. I will take a look at porting the psql frontend as well, but I figured it was a good idea to send in these patches first - so no major changes are done to the files before it gets applied (if it does). Regards, Magnus Hagander
1998-07-03 06:24:16 +02:00
/*
Fix residual breakage from Windows socket-errno patch: the routines that should use regular errno, not WSAGetLastError(), now do so again.
2001-08-04 00:11:39 +02:00
* Some other compat functions
Hello! Through some minor changes, I have been able to compile the libpq client libraries on the Win32 platform. Since the libpq communications part has been rewritten, this has become much easier. Enclosed is a patch that will allow at least Microsoft Visual C++ to compile libpq into both a static and a dynamic library. I will take a look at porting the psql frontend as well, but I figured it was a good idea to send in these patches first - so no major changes are done to the files before it gets applied (if it does). Regards, Magnus Hagander
1998-07-03 06:24:16 +02:00
*/
Attached is a patch to provide makefiles, etc. to allow the compilation of the libpq interface static and dynamic libraries with the freely downloadable Borland C++ compiler version 5.5 and/or C++ Builder. Lester Godwin
2002-12-30 22:07:26 +01:00
#ifdef __BORLANDC__
#define _timeb timeb
#define _ftime(a) ftime(a)
#define _strnicmp(a,b,c) strnicmp(a,b,c)
#define _errno errno
#else
Hello! Through some minor changes, I have been able to compile the libpq client libraries on the Win32 platform. Since the libpq communications part has been rewritten, this has become much easier. Enclosed is a patch that will allow at least Microsoft Visual C++ to compile libpq into both a static and a dynamic library. I will take a look at porting the psql frontend as well, but I figured it was a good idea to send in these patches first - so no major changes are done to the files before it gets applied (if it does). Regards, Magnus Hagander
1998-07-03 06:24:16 +02:00
#define open(a,b,c) _open(a,b,c)
Fixed psql double quoting of SQL ids Fixed libpq printing functions
2000-02-08 00:10:11 +01:00
#define close(a) _close(a)
Hello! Through some minor changes, I have been able to compile the libpq client libraries on the Win32 platform. Since the libpq communications part has been rewritten, this has become much easier. Enclosed is a patch that will allow at least Microsoft Visual C++ to compile libpq into both a static and a dynamic library. I will take a look at porting the psql frontend as well, but I figured it was a good idea to send in these patches first - so no major changes are done to the files before it gets applied (if it does). Regards, Magnus Hagander
1998-07-03 06:24:16 +02:00
#define read(a,b,c) _read(a,b,c)
#define write(a,b,c) _write(a,b,c)
Attached is a patch to provide makefiles, etc. to allow the compilation of the libpq interface static and dynamic libraries with the freely downloadable Borland C++ compiler version 5.5 and/or C++ Builder. Lester Godwin
2002-12-30 22:07:26 +01:00
#endif
Fixed psql double quoting of SQL ids Fixed libpq printing functions
2000-02-08 00:10:11 +01:00
#define popen(a,b) _popen(a,b)
#define pclose(a) _pclose(a)
The following is required in order to make beta1 compile on the Win32 platform (psql and libpq): The file "config.h.win32" in the include\ directory (from my patch from 2000-01-18) is missing from the tree. It needs to be put back :-) The following patch has to be applied in the interfaces\libpq directory. //Magnus
2000-02-24 16:53:12 +01:00
#define vsnprintf(a,b,c,d) _vsnprintf(a,b,c,d)
I downloaded new source for lib (only few hours old !!!), and made changes on this new source to make non-blocking connection work. I tested it, and PQSendQuery and PQGetResult are working fine. In win32.h I added one line: #define snprintf _snprintf Darko Prenosil
2001-07-21 06:32:42 +02:00
#define snprintf _snprintf
Hello! Through some minor changes, I have been able to compile the libpq client libraries on the Win32 platform. Since the libpq communications part has been rewritten, this has become much easier. Enclosed is a patch that will allow at least Microsoft Visual C++ to compile libpq into both a static and a dynamic library. I will take a look at porting the psql frontend as well, but I figured it was a good idea to send in these patches first - so no major changes are done to the files before it gets applied (if it does). Regards, Magnus Hagander
1998-07-03 06:24:16 +02:00
pgindent run on all C files. Java run to follow. initdb/regression tests pass.
2001-10-25 07:50:21 +02:00
#undef EAGAIN /* doesn't apply on sockets */
Fix residual breakage from Windows socket-errno patch: the routines that should use regular errno, not WSAGetLastError(), now do so again.
2001-08-04 00:11:39 +02:00
#undef EINTR
i've spotted a following problem using DBD::Pg under win32. winsock functions do not set errno, so some normal conditions are treated as fatal errors. e.g. fetching large tuples fails, as at some point recv() returns EWOULDBLOCK. here's a patch, which replaces errno with WSAGetLastError(). i've tried to to affect non-win32 code. Dmitry Yurtaev
2001-07-20 19:45:06 +02:00
#define EINTR WSAEINTR
#define EWOULDBLOCK WSAEWOULDBLOCK
#define ECONNRESET WSAECONNRESET
#define EINPROGRESS WSAEINPROGRESS
> Ok, where's a "system dependent hack" :) > It seems that win9x doesn't have the "netmsg.dll" so it defaults to "normal" > FormatMessage. > I wonder if one could load wsock32.dll or winsock.dll on those systems > instead of netmsg.dll. > > Mikhail, could you please test this code on your nt4 system? > Could someone else test this code on a win98/95 system? > > It works on win2k over here. It works on win2k here too but not on win98/95 or winNT. Anyway, attached is the patch which uses Magnus's my_sock_strerror function (renamed to winsock_strerror). The only difference is that I put the code to load and unload netmsg.dll in the libpqdll.c (is this OK Magnus?). Mikhail Terekhov
2001-08-21 22:39:54 +02:00
/*
Load netmsg.dll locally in winsock_strerror, to avoid actual and potential problems discussed in pgsql-interfaces.
2001-11-28 20:40:29 +01:00
* support for handling Windows Socket errors
> Ok, where's a "system dependent hack" :) > It seems that win9x doesn't have the "netmsg.dll" so it defaults to "normal" > FormatMessage. > I wonder if one could load wsock32.dll or winsock.dll on those systems > instead of netmsg.dll. > > Mikhail, could you please test this code on your nt4 system? > Could someone else test this code on a win98/95 system? > > It works on win2k over here. It works on win2k here too but not on win98/95 or winNT. Anyway, attached is the patch which uses Magnus's my_sock_strerror function (renamed to winsock_strerror). The only difference is that I put the code to load and unload netmsg.dll in the libpqdll.c (is this OK Magnus?). Mikhail Terekhov
2001-08-21 22:39:54 +02:00
*/
Load netmsg.dll locally in winsock_strerror, to avoid actual and potential problems discussed in pgsql-interfaces.
2001-11-28 20:40:29 +01:00
extern const char *winsock_strerror(int eno);
Hello, i noticed that win32 native stopped working/compiling after the SSL merge . So i took the opportunity to fix some stuff: 1. Made the thing compile (typos & needed definitions) with the new pqsecure_* s tuff, and added fe-secure.c to the win32.mak makefile. 2. Fixed some MULTIBYTE compile errors (when building without MB support). 3. Made it do that you can build with debug info: "nmake -f win32.mak DEBUG=1". 4. Misc small compiler speedup changes. The resulting .dll has been tested in production, and everything seems ok. I CC:ed -hackers because i'm not sure about two things: 1. In libpq-int.h I typedef ssize_t as an int because Visual C (v6.0) doesn't de fine ssize_t. Is that ok, or is there any standard about what type should be use d for ssize_t? 2. To keep the .dll api consistent regarding MULTIBYTE I just return -1 in fe-connect.c:PQsetClientEncoding() instead of taking away the whole function. I wonder if i should do any compares with the conn->client_encoding and return 0 if not hing would have changed (if so how do i check that?). Regards Magnus Naeslund
2002-07-20 07:43:31 +02:00
#endif
Reference in New Issue Copy Permalink