10/9 snapshot

Russ Allbery rra at stanford.edu
Sat Oct 23 19:05:10 UTC 1999


Javier Henderson <javier at KJSL.COM> writes:
> Russ Allbery writes:

>> Oh, wait.  Does Python have a patchlevel.h file in the include path as
>> well?

> Yes indeed. /usr/local/include/python1.5/patchlevel.h:

That'd do it.  I've just checked in the following patch, which should deal
with this until we can get the inclusion of Python.h narrowed down to just
files that don't have to be compiled with Perl include paths.

diff -u -r1.57 innd.h
--- innd.h      1999/10/10 09:42:31     1.57
+++ innd.h      1999/10/23 19:02:57
@@ -48,6 +48,10 @@
 
 #if defined(DO_PYTHON)
 #include "Python.h"
+#undef PATCHLEVEL /* Python and Perl both #define PATCHLEVEL, so as long as
+                     they have to be included in the same file we have to
+                     make sure that they don't conflict.  We use the Perl
+                     PATCHLEVEL so dump the Python one. */
 #endif /* DO_PYTHON */
 
 typedef short  SITEIDX;

-- 
Russ Allbery (rra at stanford.edu)         <URL:http://www.eyrie.org/~eagle/>


More information about the inn-workers mailing list