mirror of
https://github.com/psycopg/psycopg2.git
synced 2024-11-14 13:06:34 +03:00
Merge branch 'solaris-round' into maint_2_5
This commit is contained in:
commit
9a1dac6125
7
NEWS
7
NEWS
|
@ -1,3 +1,10 @@
|
||||||
|
What's new in psycopg 2.5.1
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
- Fixed build on Solaris 10 and 11 where the round() function is already
|
||||||
|
declared (:ticket:`#146`).
|
||||||
|
|
||||||
|
|
||||||
What's new in psycopg 2.5
|
What's new in psycopg 2.5
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
||||||
|
|
|
@ -141,7 +141,10 @@ static int pthread_mutex_init(pthread_mutex_t *mutex, void* fake)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
|
#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) \
|
||||||
|
|| (defined(_WIN32) && !defined(__GNUC__)) \
|
||||||
|
|| (defined(sun) || defined(__sun__)) \
|
||||||
|
&& (defined(__SunOS_5_8) || defined(__SunOS_5_9))
|
||||||
/* what's this, we have no round function either? */
|
/* what's this, we have no round function either? */
|
||||||
static double round(double num)
|
static double round(double num)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user