Permalink
Browse files

Merge branch 'solaris-round'

  • Loading branch information...
2 parents 5d86d07 + fdc5dc7 commit d159dfea9d1e7dd9ebc52c4cebab612596fe82c3 @dvarrazzo committed Apr 21, 2013
Showing with 11 additions and 1 deletion.
  1. +7 −0 NEWS
  2. +4 −1 psycopg/config.h
View
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
-------------------------
View
@@ -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)
{

0 comments on commit d159dfe

Please sign in to comment.