--- lib/python/python.h.orig Mon Apr 16 12:53:21 2001 +++ lib/python/python.h Thu Nov 30 22:25:14 2006 @@ -3,6 +3,22 @@ #pragma interface +#include +#undef isalnum +#undef isalpha +#undef iscntrl +#undef isdigit +#undef isgraph +#undef islower +#undef isprint +#undef ispunct +#undef isspace +#undef isupper +#undef isxdigit +#undef tolower +#undef toupper +#include + #include #include #include @@ -12,13 +28,17 @@ #include "debug.h" // I hate #define macros, seee if I can remove this -#define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1 +#define STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR 1 #ifdef MS_WIN32 -# undef STANDARD_LIBRARY_HAS_ITERATOR_TRAITS -# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0 +# undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR +# define STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR 0 +#endif + +#if defined (__GNUG__) && (__GNUG__ >= 3) +# undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR #endif -#if STANDARD_LIBRARY_HAS_ITERATOR_TRAITS +#if STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR # define random_access_iterator_parent(itemtype) std::random_access_iterator #else # define random_access_iterator_parent(itemtype) std::iterator