From a47fcdd5083bb04eff6b4de5b58b4a3127ae1bdf Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Mon, 5 Aug 2019 15:07:43 +1000 Subject: [PATCH 1/2] [psycopg/pqpath.c] sys/time.h include for non mac & Windows Signed-off-by: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> --- psycopg/pqpath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c index b21f3977..ed47a408 100644 --- a/psycopg/pqpath.c +++ b/psycopg/pqpath.c @@ -51,10 +51,10 @@ #include /* gettimeofday() */ #include "win32_support.h" -#endif - -#if defined(__sun) && defined(__SVR4) +#elif defined(__sun) && defined(__SVR4) #include "solaris_support.h" +#else +#include #endif extern HIDDEN PyObject *psyco_DescriptionType; From eb893e65f02885aeb5bf5ab4cb6152e6698f166b Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Sat, 19 Oct 2019 18:11:10 +0100 Subject: [PATCH 2/2] Mention fixing time.h include in NEWS Mostly to remember why we did it. --- NEWS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index da996b83..23362007 100644 --- a/NEWS +++ b/NEWS @@ -4,8 +4,9 @@ Current release What's new in psycopg 2.8.4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Don't swallow keyboard interrupts on connect when a password is specified -in the connection string (:ticket:`#898`). +- Don't swallow keyboard interrupts on connect when a password is specified + in the connection string (:ticket:`#898`). +- Fixed inclusion of ``time.h`` on linux (:ticket:`#951`). What's new in psycopg 2.8.3