Piet Delport patches: 1 of 3.

ChangeLog

@@ -1,3 +1,12 @@
+2006-09-23  Federico Di Gregorio  <fog@initd.org>
+
+	* Applied patch 1/3 from Piet Delport; from his email:
+           psycopg2-PyObject_HEAD.diff adds missing underscores to several
+           "PyObject_HEAD" declarations.  As far as i can tell from gdb, the 
+	   "PyObject HEAD" versions end up accidentally meaning almost exactly
+	   the same, but get aligned differently on AMD64, resulting in wrong
+	   size calculation and memory corruption later.
+
 2006-09-11  Federico Di Gregorio  <fog@initd.org>
 
 	* Fixed syntax error in lib/extras.py (see #123)

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;

psycopg/adapter_binary.h

@@ -32,7 +32,7 @@ extern "C" {
 extern PyTypeObject binaryType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     PyObject *buffer;

psycopg/adapter_datetime.h

@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject pydatetimeType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     int       type;

psycopg/adapter_list.h

@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject listType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     PyObject *connection;

psycopg/adapter_mxdatetime.h

@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject mxdatetimeType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     int       type;

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;

psycopg/adapter_qstring.h

@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject qstringType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     PyObject *buffer;

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 */
 

psycopg/cursor.h

@@ -34,7 +34,7 @@ extern "C" {
 extern PyTypeObject cursorType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     connectionObject *conn; /* connection owning the cursor */
 

psycopg/microprotocols_proto.h

@@ -32,7 +32,7 @@ extern "C" {
 extern PyTypeObject isqlquoteType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;