diff -r e7d3b509af8b -r 08a0f04b56bd mercurial/mpatch.c --- a/mercurial/mpatch.c Mon Jan 25 00:05:22 2010 -0600 +++ b/mercurial/mpatch.c Mon Jan 25 00:05:27 2010 -0600 @@ -35,13 +35,13 @@ #endif #ifdef _WIN32 -# ifdef _MSC_VER +#ifdef _MSC_VER /* msvc 6.0 has problems */ -# define inline __inline +#define inline __inline typedef unsigned long uint32_t; -# else -# include -# endif +#else +#include +#endif static uint32_t ntohl(uint32_t x) { return ((x & 0x000000ffUL) << 24) | @@ -51,13 +51,13 @@ } #else /* not windows */ -# include -# if defined __BEOS__ && !defined __HAIKU__ -# include -# else -# include -# endif -# include +#include +#if defined __BEOS__ && !defined __HAIKU__ +#include +#else +#include +#endif +#include #endif static char mpatch_doc[] = "Efficient binary patching.";