diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/editor/_coolpython.c cooledit-3.17.17/editor/_coolpython.c --- cooledit-3.17.17.orig/editor/_coolpython.c 2008-04-03 10:59:33 +0200 +++ cooledit-3.17.17/editor/_coolpython.c 2008-04-03 11:02:45 +0200 @@ -1,4 +1,15 @@ +// on interix, need this before config.h to avoid clashes +// with wchar.h, which cooledit believes is not there, and therefore +// defines mbstate_t. Python.h includes it, and thus wchar.h messes up. +#ifdef __cplusplus +extern "C" { +#endif +#include "Python.h" +#ifdef __cplusplus +} +#endif + #include #ifdef HAVE_PYTHON diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/rxvt/_rxvtlib.h cooledit-3.17.17/rxvt/_rxvtlib.h --- cooledit-3.17.17.orig/rxvt/_rxvtlib.h 2008-04-03 11:10:02 +0200 +++ cooledit-3.17.17/rxvt/_rxvtlib.h 2008-04-03 09:00:13 +0200 @@ -170,7 +170,7 @@ #include #include #include -#if !defined(__NetBSD__) && !defined(__OpenBSD__) +#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) #include #endif #include "X11/keysymdef.h"