This should work?

--- Pike-v7.8.866.orig/src/modules/_Image_JPEG/transupp.c +++ Pike-v7.8.866/src/modules/_Image_JPEG/transupp.c @@ -36,17 +36,7 @@ * of internals, and added inclusion of jerror.h */

-#define FILE void -#define size_t unsigned int -/* NOTE: INT32 and INT16 are redefined by <jmorecfg.h>. */ -#if 0 -#ifdef INT16 -#undef INT16 -#endif /* INT16 */ -#ifdef INT32 -#undef INT32 -#endif -#endif /* 0 */ +#include <stdio.h>

#define XMD_H /* Avoid INT16 / INT32 being redefined */