Micrsoft Visual C Compile Fix

Moved the declarations of variables/pointers to the beginning of the block, where MSVC wants them.
This commit is contained in:
Jason Erickson 2010-05-16 15:20:22 -06:00 committed by Federico Di Gregorio
parent e286970b62
commit 1f1133b871
2 changed files with 5 additions and 3 deletions

View File

@ -56,6 +56,8 @@ extern HIDDEN PyObject *pyPsycopgTzLOCAL;
static PyObject *
pydatetime_str(pydatetimeObject *self)
{
PyObject *res = NULL;
PyObject *iso;
if (self->type <= PSYCO_DATETIME_TIMESTAMP) {
PyObject *tz;
@ -76,8 +78,7 @@ pydatetime_str(pydatetimeObject *self)
break;
}
PyObject *res = NULL;
PyObject *iso = PyObject_CallMethod(self->wrapped, "isoformat", NULL);
iso = PyObject_CallMethod(self->wrapped, "isoformat", NULL);
if (iso) {
res = PyString_FromFormat(fmt, PyString_AsString(iso));
Py_DECREF(iso);

View File

@ -256,6 +256,7 @@ int
conn_setup(connectionObject *self, PGconn *pgconn)
{
PGresult *pgres;
int green;
self->equote = conn_get_standard_conforming_strings(pgconn);
self->server_version = conn_get_server_version(pgconn);
@ -265,7 +266,7 @@ conn_setup(connectionObject *self, PGconn *pgconn)
pthread_mutex_lock(&self->lock);
Py_BLOCK_THREADS;
int green = psyco_green();
green = psyco_green();
if (green && (pq_set_non_blocking(self, 1, 1) != 0)) {
return -1;