diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-07-20 05:43:31 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-07-20 05:43:31 +0000 |
| commit | b6d2faaf24cb7f39c66667d2c1d1472f3c9ab4f8 (patch) | |
| tree | a571ae16af325d8b35274b63743c089b2eeb2606 /src/interfaces/libpq/fe-connect.c | |
| parent | 1430271e99a5baa2bcc6f05c2f58ded4faa630a9 (diff) | |
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
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 630141ed549..19805db9813 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.189 2002/07/18 02:02:30 ishii Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.190 2002/07/20 05:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2717,6 +2717,9 @@ PQclientEncoding(const PGconn *conn) int PQsetClientEncoding(PGconn *conn, const char *encoding) { + +#ifdef MULTIBYTE + char qbuf[128]; static char query[] = "set client_encoding to '%s'"; PGresult *res; @@ -2748,6 +2751,9 @@ PQsetClientEncoding(PGconn *conn, const char *encoding) } PQclear(res); return (status); +#else + return -1; /* Multibyte support isn't compiled in */ +#endif } void |