1 Index: psycopg2-2.0.14/psycopg/config.h |
1 Index: psycopg2-2.4/psycopg/config.h |
2 --- psycopg2-2.0.14/psycopg/config.h.orig 2009-04-26 14:09:21 +0200 |
2 diff -Nau psycopg2-2.4psycopg/config.h.orig/ psycopg2-2.4/psycopg/config.h |
3 +++ psycopg2-2.0.14/psycopg/config.h 2009-10-08 22:31:01 +0200 |
3 --- psycopg2-2.4/psycopg/config.h.orig 2011-02-27 12:44:55.000000000 +0100 |
4 @@ -140,10 +140,11 @@ |
4 +++ psycopg2-2.4/psycopg/config.h 2011-03-22 19:19:11.648184363 +0100 |
|
5 @@ -141,10 +141,11 @@ |
5 |
6 |
6 #if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun) |
7 #if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun) |
7 /* what's this, we have no round function either? */ |
8 /* what's this, we have no round function either? */ |
8 -static double round(double num) |
9 -static double round(double num) |
9 +static double my_round(double num) |
10 +static double my_round(double num) |
12 } |
13 } |
13 +#define round(num) my_round(num) |
14 +#define round(num) my_round(num) |
14 #endif |
15 #endif |
15 |
16 |
16 /* postgresql < 7.4 does not have PQfreemem */ |
17 /* postgresql < 7.4 does not have PQfreemem */ |
17 Index: psycopg2-2.0.14/setup.py |
18 Index: psycopg2-2.4/setup.py |
18 --- psycopg2-2.0.14/setup.py.orig 2009-10-04 23:37:14 +0200 |
19 diff -Nau psycopg2-2.4/setup.py.orig/ psycopg2-2.4/setup.py |
19 +++ psycopg2-2.0.14/setup.py 2009-10-08 23:15:48 +0200 |
20 --- psycopg2-2.4/setup.py.orig 2011-02-27 12:46:47.000000000 +0100 |
20 @@ -203,6 +203,9 @@ |
21 +++ psycopg2-2.4/setup.py 2011-03-22 19:36:51.906859031 +0100 |
|
22 @@ -269,6 +269,9 @@ |
21 os.path.join(self.get_pg_config("libdir"), "libpq.a")) |
23 os.path.join(self.get_pg_config("libdir"), "libpq.a")) |
22 else: |
24 else: |
23 self.libraries.append("pq") |
25 self.libraries.append("pq") |
24 + self.libraries.append("ssl") |
26 + self.libraries.append("ssl") |
25 + self.libraries.append("crypto") |
27 + self.libraries.append("crypto") |