diff -r 9d023ef7b467 -r bfad9865b1dc mercurial/mpatch.c --- a/mercurial/mpatch.c Sat Sep 13 17:46:09 2008 +0200 +++ b/mercurial/mpatch.c Wed Sep 17 10:22:35 2008 +0200 @@ -52,7 +52,7 @@ #else /* not windows */ # include -# ifdef __BEOS__ +# if defined __BEOS__ && !defined __HAIKU__ # include # else # include