From: Marcin Gajda Date: Sat, 16 Oct 2004 10:22:09 +0000 (+0000) Subject: - macro APR_STATUS_IS_SUCCESS was removed from libapr; use APR_STATUS constant X-Git-Tag: auto/ac/apache-mod_python-3_1_3-5 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=commitdiff_plain;h=a875701ddfc159d08848a5ebd88034893703ecc7 - macro APR_STATUS_IS_SUCCESS was removed from libapr; use APR_STATUS constant instead (see APR_STATUS_IS_SUCCESS keyword in Google ;)) Changed files: apache-mod_python-apr-status-is-success.patch -> 1.1 --- diff --git a/apache-mod_python-apr-status-is-success.patch b/apache-mod_python-apr-status-is-success.patch new file mode 100644 index 0000000..774eaf5 --- /dev/null +++ b/apache-mod_python-apr-status-is-success.patch @@ -0,0 +1,24 @@ +diff -Nur mod_python-3.1.3-orig/src/connobject.c mod_python-3.1.3/src/connobject.c +--- mod_python-3.1.3-orig/src/connobject.c 2004-02-16 20:47:27.000000000 +0100 ++++ mod_python-3.1.3/src/connobject.c 2004-10-16 12:03:50.870833912 +0200 +@@ -78,7 +78,7 @@ + rc = ap_get_brigade(c->input_filters, bb, mode, APR_BLOCK_READ, bufsize); + Py_END_ALLOW_THREADS; + +- if (! APR_STATUS_IS_SUCCESS(rc)) { ++ if ( rc != APR_SUCCESS ) { + PyErr_SetObject(PyExc_IOError, + PyString_FromString("Connection read error")); + return NULL; +diff -Nur mod_python-3.1.3-orig/src/filterobject.c mod_python-3.1.3/src/filterobject.c +--- mod_python-3.1.3-orig/src/filterobject.c 2004-02-16 20:47:27.000000000 +0100 ++++ mod_python-3.1.3/src/filterobject.c 2004-10-16 12:04:10.783806680 +0200 +@@ -178,7 +178,7 @@ + APR_BLOCK_READ, self->readbytes); + Py_END_ALLOW_THREADS; + +- if (!APR_STATUS_IS_EAGAIN(self->rc) && !APR_STATUS_IS_SUCCESS(self->rc)) { ++ if (!APR_STATUS_IS_EAGAIN(self->rc) && self->rc != APR_SUCCESS ) { + PyErr_SetObject(PyExc_IOError, + PyString_FromString("Input filter read error")); + return NULL;