aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/tcop/postgres.c7
-rw-r--r--src/include/libpq/libpq-be.h9
2 files changed, 9 insertions, 7 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index f56b3dc3874..abb682686dc 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.392 2004/02/17 04:09:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.393 2004/02/21 06:29:58 tgl Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -3240,8 +3240,9 @@ log_disconnections(int code, Datum arg)
snprintf(session_time,sizeof(session_time),"negative!");
else
/* for stricter accuracy here we could round - this is close enough */
- snprintf(session_time, sizeof(session_time),"%d:%02d:%02d.%02ld",
- hours, minutes, seconds, end.tv_usec/10000);
+ snprintf(session_time, sizeof(session_time),
+ "%d:%02d:%02d.%02d",
+ hours, minutes, seconds, (int) (end.tv_usec/10000));
ereport(
LOG,
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 09bd92136d3..9c6a474d7f8 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -11,21 +11,22 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.40 2004/02/17 03:54:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.41 2004/02/21 06:29:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef LIBPQ_BE_H
#define LIBPQ_BE_H
-#include "libpq/hba.h"
-#include "libpq/pqcomm.h"
-
+#include <sys/time.h>
#ifdef USE_SSL
#include <openssl/ssl.h>
#include <openssl/err.h>
#endif
+#include "libpq/hba.h"
+#include "libpq/pqcomm.h"
+
typedef enum CAC_state
{