changeset 7036:bfad9865b1dc

allow Mercurial to compile on Haiku
author Scott McCreary <scottmc2@gmail.com>
date Wed, 17 Sep 2008 10:22:35 +0200
parents 9d023ef7b467
children e3f9feb9ab7e
files mercurial/bdiff.c mercurial/mpatch.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bdiff.c	Sat Sep 13 17:46:09 2008 +0200
+++ b/mercurial/bdiff.c	Wed Sep 17 10:22:35 2008 +0200
@@ -34,7 +34,7 @@
 }
 #else
 #include <sys/types.h>
-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
 #include <ByteOrder.h>
 #else
 #include <arpa/inet.h>
--- 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 <sys/types.h>
-# ifdef __BEOS__
+# if defined __BEOS__ && !defined __HAIKU__
 #  include <ByteOrder.h>
 # else
 #  include <arpa/inet.h>