diff options
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 12 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index dc262dacd81..ef80ed7e454 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.193 2002/08/18 00:06:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.194 2002/08/18 01:35:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -111,8 +111,8 @@ static const PQconninfoOption PQconninfoOptions[] = { {"password", "PGPASSWORD", DefaultPassword, NULL, "Database-Password", "*", 20}, - {"connect_timeout", "PGCONNECT_TIMEOUT", NULL, NULL, - "Connect-timeout", "", 10}, /* strlen( INT32_MAX) == 10 */ + {"connect_timeout", "PGCONNECT_TIMEOUT", NULL, NULL, + "Connect-timeout", "", 10}, /* strlen( INT32_MAX) == 10 */ {"dbname", "PGDATABASE", NULL, NULL, "Database-Name", "", 20}, @@ -306,8 +306,8 @@ PQconnectStart(const char *conninfo) conn->pguser = tmp ? strdup(tmp) : NULL; tmp = conninfo_getval(connOptions, "password"); conn->pgpass = tmp ? strdup(tmp) : NULL; - tmp = conninfo_getval(connOptions, "connect_timeout"); - conn->connect_timeout = tmp ? strdup(tmp) : NULL; + tmp = conninfo_getval(connOptions, "connect_timeout"); + conn->connect_timeout = tmp ? strdup(tmp) : NULL; #ifdef USE_SSL tmp = conninfo_getval(connOptions, "requiressl"); if (tmp && tmp[0] == '1') @@ -1058,7 +1058,7 @@ connectDBComplete(PGconn *conn) { PostgresPollingStatusType flag = PGRES_POLLING_WRITING; - struct timeval remains, *rp = NULL, finish_time, start_time; + struct timeval remains, *rp = NULL, finish_time, start_time; if (conn == NULL || conn->status == CONNECTION_BAD) return 0; diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 2ee819ff1e6..af533444bfd 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-int.h,v 1.53 2002/08/17 12:33:18 momjian Exp $ + * $Id: libpq-int.h,v 1.54 2002/08/18 01:35:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,9 @@ #ifndef LIBPQ_INT_H #define LIBPQ_INT_H +#include <sys/types.h> +#include <time.h> + #if defined(WIN32) && (!defined(ssize_t)) typedef int ssize_t; /* ssize_t doesn't exist in VC (atleast not VC6) */ #endif @@ -334,7 +337,7 @@ extern int pqReadData(PGconn *conn); extern int pqFlush(PGconn *conn); extern int pqSendSome(PGconn *conn); extern int pqWait(int forRead, int forWrite, PGconn *conn); -extern int pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval* timeout); +extern int pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval* timeout); extern int pqReadReady(PGconn *conn); extern int pqWriteReady(PGconn *conn); |