From f4dc6936a27afc8d4e5b74b3aae33e9dfed32670 Mon Sep 17 00:00:00 2001 From: Federico Di Gregorio Date: Sun, 29 Oct 2006 03:12:51 +0000 Subject: [PATCH] Builds again on win32 (closes: #132). --- ChangeLog | 5 +++++ psycopg/adapter_asis.h | 2 +- psycopg/adapter_binary.h | 2 +- psycopg/adapter_datetime.h | 2 +- psycopg/adapter_list.h | 2 +- psycopg/adapter_mxdatetime.h | 2 +- psycopg/adapter_pboolean.h | 2 +- psycopg/adapter_qstring.h | 2 +- psycopg/connection.h | 2 +- psycopg/cursor.h | 2 +- psycopg/microprotocols_proto.h | 2 +- 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76d213e0..e4ee3672 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-29 Federico Di Gregorio + + * Applied patch from Jason Erickson to make psycopg build + again on win32 (closes: #132). + 2006-09-30 Federico Di Gregorio * ZpsycopgDA/DA.py: applied the infinity patch from 1.1 (fixes #122). diff --git a/psycopg/adapter_asis.h b/psycopg/adapter_asis.h index 90353b7b..789dc41d 100644 --- a/psycopg/adapter_asis.h +++ b/psycopg/adapter_asis.h @@ -31,7 +31,7 @@ extern "C" { extern PyTypeObject asisType; typedef struct { - PyObject_HEAD; + PyObject_HEAD /* this is the real object we wrap */ PyObject *wrapped; diff --git a/psycopg/adapter_binary.h b/psycopg/adapter_binary.h index d95caa8e..5f2c7812 100644 --- a/psycopg/adapter_binary.h +++ b/psycopg/adapter_binary.h @@ -32,7 +32,7 @@ extern "C" { extern PyTypeObject binaryType; typedef struct { - PyObject_HEAD; + PyObject_HEAD PyObject *wrapped; PyObject *buffer; diff --git a/psycopg/adapter_datetime.h b/psycopg/adapter_datetime.h index 5c2e473d..0827fe3a 100644 --- a/psycopg/adapter_datetime.h +++ b/psycopg/adapter_datetime.h @@ -31,7 +31,7 @@ extern "C" { extern PyTypeObject pydatetimeType; typedef struct { - PyObject_HEAD; + PyObject_HEAD PyObject *wrapped; int type; diff --git a/psycopg/adapter_list.h b/psycopg/adapter_list.h index e56764bb..22a41b1f 100644 --- a/psycopg/adapter_list.h +++ b/psycopg/adapter_list.h @@ -31,7 +31,7 @@ extern "C" { extern PyTypeObject listType; typedef struct { - PyObject_HEAD; + PyObject_HEAD PyObject *wrapped; PyObject *connection; diff --git a/psycopg/adapter_mxdatetime.h b/psycopg/adapter_mxdatetime.h index 11e5cf8f..4811d535 100644 --- a/psycopg/adapter_mxdatetime.h +++ b/psycopg/adapter_mxdatetime.h @@ -31,7 +31,7 @@ extern "C" { extern PyTypeObject mxdatetimeType; typedef struct { - PyObject_HEAD; + PyObject_HEAD PyObject *wrapped; int type; diff --git a/psycopg/adapter_pboolean.h b/psycopg/adapter_pboolean.h index 392b047a..d50b767b 100644 --- a/psycopg/adapter_pboolean.h +++ b/psycopg/adapter_pboolean.h @@ -31,7 +31,7 @@ extern "C" { extern PyTypeObject pbooleanType; typedef struct { - PyObject_HEAD; + PyObject_HEAD /* this is the real object we wrap */ PyObject *wrapped; diff --git a/psycopg/adapter_qstring.h b/psycopg/adapter_qstring.h index 516342f1..61c1a8ae 100644 --- a/psycopg/adapter_qstring.h +++ b/psycopg/adapter_qstring.h @@ -31,7 +31,7 @@ extern "C" { extern PyTypeObject qstringType; typedef struct { - PyObject_HEAD; + PyObject_HEAD PyObject *wrapped; PyObject *buffer; diff --git a/psycopg/connection.h b/psycopg/connection.h index d19006e0..c50ce4e4 100644 --- a/psycopg/connection.h +++ b/psycopg/connection.h @@ -38,7 +38,7 @@ extern "C" { extern PyTypeObject connectionType; typedef struct { - PyObject_HEAD; + PyObject_HEAD pthread_mutex_t lock; /* the global connection lock */ diff --git a/psycopg/cursor.h b/psycopg/cursor.h index 6ae88a29..be5d9289 100644 --- a/psycopg/cursor.h +++ b/psycopg/cursor.h @@ -34,7 +34,7 @@ extern "C" { extern PyTypeObject cursorType; typedef struct { - PyObject_HEAD; + PyObject_HEAD connectionObject *conn; /* connection owning the cursor */ diff --git a/psycopg/microprotocols_proto.h b/psycopg/microprotocols_proto.h index d578b04f..c9203ee9 100644 --- a/psycopg/microprotocols_proto.h +++ b/psycopg/microprotocols_proto.h @@ -32,7 +32,7 @@ extern "C" { extern PyTypeObject isqlquoteType; typedef struct { - PyObject_HEAD; + PyObject_HEAD PyObject *wrapped;