Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5bf6af6

Browse files
committed
Add includes for prototype using timeval.
1 parent1c69f13 commit5bf6af6

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

‎src/interfaces/libpq/fe-connect.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.193 2002/08/1800:06:01 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.194 2002/08/1801:35:39 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -111,8 +111,8 @@ static const PQconninfoOption PQconninfoOptions[] = {
111111
{"password","PGPASSWORD",DefaultPassword,NULL,
112112
"Database-Password","*",20},
113113

114-
{"connect_timeout","PGCONNECT_TIMEOUT",NULL,NULL,
115-
"Connect-timeout","",10},/* strlen( INT32_MAX) == 10 */
114+
{"connect_timeout","PGCONNECT_TIMEOUT",NULL,NULL,
115+
"Connect-timeout","",10},/* strlen( INT32_MAX) == 10 */
116116

117117
{"dbname","PGDATABASE",NULL,NULL,
118118
"Database-Name","",20},
@@ -306,8 +306,8 @@ PQconnectStart(const char *conninfo)
306306
conn->pguser=tmp ?strdup(tmp) :NULL;
307307
tmp=conninfo_getval(connOptions,"password");
308308
conn->pgpass=tmp ?strdup(tmp) :NULL;
309-
tmp=conninfo_getval(connOptions,"connect_timeout");
310-
conn->connect_timeout=tmp ?strdup(tmp) :NULL;
309+
tmp=conninfo_getval(connOptions,"connect_timeout");
310+
conn->connect_timeout=tmp ?strdup(tmp) :NULL;
311311
#ifdefUSE_SSL
312312
tmp=conninfo_getval(connOptions,"requiressl");
313313
if (tmp&&tmp[0]=='1')
@@ -1058,7 +1058,7 @@ connectDBComplete(PGconn *conn)
10581058
{
10591059
PostgresPollingStatusTypeflag=PGRES_POLLING_WRITING;
10601060

1061-
structtimevalremains,*rp=NULL,finish_time,start_time;
1061+
structtimevalremains,*rp=NULL,finish_time,start_time;
10621062

10631063
if (conn==NULL||conn->status==CONNECTION_BAD)
10641064
return0;

‎src/interfaces/libpq/libpq-int.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
15-
* $Id: libpq-int.h,v 1.53 2002/08/17 12:33:18 momjian Exp $
15+
* $Id: libpq-int.h,v 1.54 2002/08/18 01:35:40 momjian Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
1919

2020
#ifndefLIBPQ_INT_H
2121
#defineLIBPQ_INT_H
2222

23+
#include<sys/types.h>
24+
#include<time.h>
25+
2326
#if defined(WIN32)&& (!defined(ssize_t))
2427
typedefintssize_t;/* ssize_t doesn't exist in VC (atleast not VC6) */
2528
#endif
@@ -334,7 +337,7 @@ extern intpqReadData(PGconn *conn);
334337
externintpqFlush(PGconn*conn);
335338
externintpqSendSome(PGconn*conn);
336339
externintpqWait(intforRead,intforWrite,PGconn*conn);
337-
externintpqWaitTimed(intforRead,intforWrite,PGconn*conn,conststructtimeval*timeout);
340+
externintpqWaitTimed(intforRead,intforWrite,PGconn*conn,conststructtimeval*timeout);
338341
externintpqReadReady(PGconn*conn);
339342
externintpqWriteReady(PGconn*conn);
340343

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp