Fix random build breakage from log_disconnections patch.

tglsfdc · tglsfdc · commit a81b9d679f4e · 2004-02-21T06:29:58.000Z
diff --git 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
@@ -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
 {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.392 2004/02/17 04:09:26 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.393 2004/02/21 06:29:58 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -3240,8 +3240,9 @@ log_disconnections(int code, Datum arg)`
`3240`	`3240`	`snprintf(session_time,sizeof(session_time),"negative!");`
`3241`	`3241`	`else`
`3242`	`3242`	`/* for stricter accuracy here we could round - this is close enough */`
`3243`		`- snprintf(session_time, sizeof(session_time),"%d:%02d:%02d.%02ld",`
`3244`		`- hours, minutes, seconds, end.tv_usec/10000);`
	`3243`	`+ snprintf(session_time, sizeof(session_time),`
	`3244`	`+ "%d:%02d:%02d.%02d",`
	`3245`	`+ hours, minutes, seconds, (int) (end.tv_usec/10000));`
`3245`	`3246`
`3246`	`3247`	`ereport(`
`3247`	`3248`	`LOG,`