psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-08-02 19:30:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 13d352fb18 into df952c149d

Browse Source
This commit is contained in:
Weliton Freitas 2018-02-16 22:49:40 +00:00 committed by GitHub
commit 61d7306e3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
psycopg/win32_support.c
View File

@ -30,7 +30,6 @@
#ifdef _WIN32 #ifdef _WIN32
#ifndef __MINGW32__
/* millisecond-precision port of gettimeofday for Win32, taken from /* millisecond-precision port of gettimeofday for Win32, taken from
src/port/gettimeofday.c in PostgreSQL core */ src/port/gettimeofday.c in PostgreSQL core */
@ -61,7 +60,7 @@ gettimeofday(struct timeval * tp, void * tzp)
return 0; return 0;
} }
/* timeradd missing on MS VC */ /* timeradd missing on MS VC and mingw */
void void
timeradd(struct timeval *a, struct timeval *b, struct timeval *c) timeradd(struct timeval *a, struct timeval *b, struct timeval *c)
{ {
@ -72,7 +71,6 @@ timeradd(struct timeval *a, struct timeval *b, struct timeval *c)
c->tv_sec += 1; c->tv_sec += 1;
} }
} }
#endif /* !defined(__MINGW32__) */
/* timersub is missing on mingw & MS VC */ /* timersub is missing on mingw & MS VC */
void void

3
psycopg/win32_support.h
View File

@ -36,11 +36,8 @@
#ifdef _WIN32 #ifdef _WIN32
#ifndef __MINGW32__
extern HIDDEN int gettimeofday(struct timeval * tp, void * tzp); extern HIDDEN int gettimeofday(struct timeval * tp, void * tzp);
extern HIDDEN void timeradd(struct timeval *a, struct timeval *b, struct timeval *c); extern HIDDEN void timeradd(struct timeval *a, struct timeval *b, struct timeval *c);
#elif
#endif
extern HIDDEN void timersub(struct timeval *a, struct timeval *b, struct timeval *c); extern HIDDEN void timersub(struct timeval *a, struct timeval *b, struct timeval *c);
#endif #endif

2
setup.py
View File

@ -599,7 +599,7 @@ else:
if not PLATFORM_IS_WINDOWS: if not PLATFORM_IS_WINDOWS:
define_macros.append(('PSYCOPG_VERSION', '"' + PSYCOPG_VERSION_EX + '"')) define_macros.append(('PSYCOPG_VERSION', '"' + PSYCOPG_VERSION_EX + '"'))
else: else:
define_macros.append(('PSYCOPG_VERSION', '\\"' + PSYCOPG_VERSION_EX + '\\"')) define_macros.append(('PSYCOPG_VERSION', '\"' + PSYCOPG_VERSION_EX + '\"'))
if parser.has_option('build_ext', 'have_ssl'): if parser.has_option('build_ext', 'have_ssl'):
have_ssl = int(parser.get('build_ext', 'have_ssl')) have_ssl = int(parser.get('build_ext', 'have_ssl'))