diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-10-03 17:09:42 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-10-03 17:09:42 +0000 |
| commit | a0bf2503ea0d9a1a2208dd3cf74727bcda7e69d2 (patch) | |
| tree | aa3d6727dc94d4a0c4741077184e7cfcf5cdf709 /src/interfaces/libpq/fe-misc.c | |
| parent | d4eae72513d919522c8711b55894511f4fb49443 (diff) | |
| download | postgresql-a0bf2503ea0d9a1a2208dd3cf74727bcda7e69d2.tar.gz | |
The attached patch fixes a number of issues related to compiling the
client
utilities (libpq.dll and psql.exe) for win32 (missing defines,
adjustments to
includes, pedantic casting, non-existent functions) per:
http://developer.postgresql.org/docs/postgres/install-win32.html.
It compiles cleanly under Windows 2000 using Visual Studio .net. Also
compiles clean and passes all regression tests (regular and contrib)
under Linux.
In addition to a review by the usual suspects, it would be very
desirable for someone well versed in the peculiarities of win32 to take
a look.
Joe Conway
Diffstat (limited to 'src/interfaces/libpq/fe-misc.c')
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 794e757d56..ad41cf749d 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -25,7 +25,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.79 2002/09/04 20:31:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.80 2002/10/03 17:09:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -150,9 +150,9 @@ pqPutBytes(const char *s, size_t nbytes, PGconn *conn) * try to grow the buffer. FIXME: The new size could be * chosen more intelligently. */ - size_t buflen = conn->outCount + nbytes; + size_t buflen = (size_t) conn->outCount + nbytes; - if (buflen > conn->outBufSize) + if (buflen > (size_t) conn->outBufSize) { char *newbuf = realloc(conn->outBuffer, buflen); @@ -240,7 +240,7 @@ pqPuts(const char *s, PGconn *conn) int pqGetnchar(char *s, size_t len, PGconn *conn) { - if (len < 0 || len > conn->inEnd - conn->inCursor) + if (len < 0 || len > (size_t) (conn->inEnd - conn->inCursor)) return EOF; memcpy(s, conn->inBuffer + conn->inCursor, len); |
