From: Gerhard H?r. <gha...@us...> - 2002-10-02 04:08:41
|
Update of /cvsroot/pypgsql/pypgsql In directory usw-pr-cvs1:/tmp/cvs-serv16789 Modified Files: libpqmodule.c pgint2object.c pgint8object.c pgresult.c pgversion.c pgint8object.h Log Message: 01OCT2002 gh HAVE_LONG_LONG => HAVE_LONG_LONG_SUPPORT (see port/port.h) Index: libpqmodule.c =================================================================== RCS file: /cvsroot/pypgsql/pypgsql/libpqmodule.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** libpqmodule.c 21 Apr 2002 20:36:06 -0000 1.23 --- libpqmodule.c 2 Oct 2002 04:08:37 -0000 1.24 *************** *** 32,35 **** --- 32,36 ---- | Date Ini Description | | --------- --- ------------------------------------------------------- | + | 01OCT2002 gh HAVE_LONG_LONG => HAVE_LONG_LONG_SUPPORT | | 21APR2002 gh Removed special escaping of control characters in | | arrays. | *************** *** 776,780 **** /*--------------------------------------------------------------------------*/ ! #if defined(HAVE_LONG_LONG) static PyObject *libPQint8_FromObject(PyObject *self, PyObject *args) { --- 777,781 ---- /*--------------------------------------------------------------------------*/ ! #if defined(HAVE_LONG_LONG_SUPPORT) static PyObject *libPQint8_FromObject(PyObject *self, PyObject *args) { *************** *** 848,852 **** return PgInt2_FromLong(PyInt_AS_LONG(obj)); } ! #if defined(HAVE_LONG_LONG) else if (PgInt8_Check(obj)) { --- 849,853 ---- return PgInt2_FromLong(PyInt_AS_LONG(obj)); } ! #if defined(HAVE_LONG_LONG_SUPPORT) else if (PgInt8_Check(obj)) { *************** *** 999,1003 **** { "PgBooleanFromInteger", (PyCFunction)libPQbool_FromInt, 1 }, { "PgBoolean", (PyCFunction)libPQbool_FromObject, 1 }, ! #if defined(HAVE_LONG_LONG) { "PgInt8", (PyCFunction)libPQint8_FromObject, 1 }, #endif --- 1000,1004 ---- { "PgBooleanFromInteger", (PyCFunction)libPQbool_FromInt, 1 }, { "PgBoolean", (PyCFunction)libPQbool_FromObject, 1 }, ! #if defined(HAVE_LONG_LONG_SUPPORT) { "PgInt8", (PyCFunction)libPQint8_FromObject, 1 }, #endif *************** *** 1026,1030 **** initpgboolean(); initpgint2(); ! #if defined(HAVE_LONG_LONG) initpgint8(); #endif --- 1027,1031 ---- initpgboolean(); initpgint2(); ! #if defined(HAVE_LONG_LONG_SUPPORT) initpgint8(); #endif *************** *** 1195,1199 **** (PyObject *)&PgLargeObject_Type); PyDict_SetItemString(d, "PgBooleanType", (PyObject *)&PgBoolean_Type); ! #if defined(HAVE_LONG_LONG) PyDict_SetItemString(d, "PgInt8Type", (PyObject *)&PgInt8_Type); #endif --- 1196,1200 ---- (PyObject *)&PgLargeObject_Type); PyDict_SetItemString(d, "PgBooleanType", (PyObject *)&PgBoolean_Type); ! #if defined(HAVE_LONG_LONG_SUPPORT) PyDict_SetItemString(d, "PgInt8Type", (PyObject *)&PgInt8_Type); #endif Index: pgint2object.c =================================================================== RCS file: /cvsroot/pypgsql/pypgsql/pgint2object.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pgint2object.c 4 Nov 2001 05:36:03 -0000 1.11 --- pgint2object.c 2 Oct 2002 04:08:38 -0000 1.12 *************** *** 33,36 **** --- 33,37 ---- | Date Ini Description | | --------- --- ------------------------------------------------------- | + | 01OCT2002 gh HAVE_LONG_LONG => HAVE_LONG_LONG_SUPPORT | | 01OCT2001 bga Changed all new style comments to original style. | | 26SEP2001 bga Change the constructors so that they return PyObject * | *************** *** 316,320 **** Py_INCREF(*pw); } ! #if defined(HAVE_LONG_LONG) else if (PgInt8_Check(*pw)) { --- 317,321 ---- Py_INCREF(*pw); } ! #if defined(HAVE_LONG_LONG_SUPPORT) else if (PgInt8_Check(*pw)) { *************** *** 350,354 **** Py_INCREF(*pv); } ! #if defined(HAVE_LONG_LONG) else if (PgInt8_Check(*pv)) { --- 351,355 ---- Py_INCREF(*pv); } ! #if defined(HAVE_LONG_LONG_SUPPORT) else if (PgInt8_Check(*pv)) { Index: pgint8object.c =================================================================== RCS file: /cvsroot/pypgsql/pypgsql/pgint8object.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pgint8object.c 16 Sep 2002 05:42:06 -0000 1.12 --- pgint8object.c 2 Oct 2002 04:08:38 -0000 1.13 *************** *** 40,43 **** --- 40,44 ---- | Date Ini Description | | --------- --- ------------------------------------------------------- | + | 01OCT2002 gh HAVE_LONG_LONG => HAVE_LONG_LONG_SUPPORT | | 16SEP2002 gh Reflect the change from windows/ to port/. | | 01OCT2001 bga Changed all new style comments to original style. | *************** *** 73,77 **** #include "libpqmodule.h" ! #if defined(HAVE_LONG_LONG) static PyObject *err_ovf(char *msg) --- 74,78 ---- #include "libpqmodule.h" ! #if defined(HAVE_LONG_LONG_SUPPORT) static PyObject *err_ovf(char *msg) Index: pgresult.c =================================================================== RCS file: /cvsroot/pypgsql/pypgsql/pgresult.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pgresult.c 4 Feb 2002 02:12:04 -0000 1.17 --- pgresult.c 2 Oct 2002 04:08:38 -0000 1.18 *************** *** 29,32 **** --- 29,33 ---- | Date Ini Description | | --------- --- ------------------------------------------------------- | + | 01OCT2002 gh HAVE_LONG_LONG => HAVE_LONG_LONG_SUPPORT | | 03FEB2002 bga Change the constant that is used to determine when to | | check an OID to see if it is a Large Object form 1700 | *************** *** 596,600 **** case PG_INT8: ! #if defined(HAVE_LONG_LONG) valueObj = (PyObject *)PgInt8_FromString(value, (char **)NULL, 10); --- 597,601 ---- case PG_INT8: ! #if defined(HAVE_LONG_LONG_SUPPORT) valueObj = (PyObject *)PgInt8_FromString(value, (char **)NULL, 10); Index: pgversion.c =================================================================== RCS file: /cvsroot/pypgsql/pypgsql/pgversion.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pgversion.c 16 Sep 2002 05:45:29 -0000 1.17 --- pgversion.c 2 Oct 2002 04:08:38 -0000 1.18 *************** *** 348,355 **** --- 348,357 ---- value = PyInt_AsLong(*r); } + #if defined(HAVE_LONG_LONG_SUPPORT) if (PgInt8_Check(*r)) { value = PgInt8_AsLong((PgInt8Object *)(*r)); } + #endif else if (PyLong_Check(*r)) { Index: pgint8object.h =================================================================== RCS file: /cvsroot/pypgsql/pypgsql/pgint8object.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pgint8object.h 26 Sep 2001 05:45:30 -0000 1.5 --- pgint8object.h 2 Oct 2002 04:08:38 -0000 1.6 *************** *** 5,9 **** extern "C" { #endif ! #if defined(HAVE_LONG_LONG) /***********************************************************************\ --- 5,9 ---- extern "C" { #endif ! #if defined(HAVE_LONG_LONG_SUPPORT) /***********************************************************************\ |