diff options
| author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2013-04-21 18:39:30 +0100 |
|---|---|---|
| committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2013-04-21 18:39:30 +0100 |
| commit | d159dfea9d1e7dd9ebc52c4cebab612596fe82c3 (patch) | |
| tree | 98513c697798a7d41851cdc111ccef75f78870c0 | |
| parent | 5d86d07618c5e0b2bb72ebf7ca14e3191e87898b (diff) | |
| parent | fdc5dc750c7003da226132195dcfa832bc16a512 (diff) | |
| download | psycopg2-d159dfea9d1e7dd9ebc52c4cebab612596fe82c3.tar.gz | |
Merge branch 'solaris-round'
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | psycopg/config.h | 5 |
2 files changed, 11 insertions, 1 deletions
@@ -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 ------------------------- diff --git a/psycopg/config.h b/psycopg/config.h index f309449..4515770 100644 --- a/psycopg/config.h +++ b/psycopg/config.h @@ -141,7 +141,10 @@ static int pthread_mutex_init(pthread_mutex_t *mutex, void* fake) #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? */ static double round(double num) { |