From 208dc2cb51ffbe6ca049e37c0e201c101bd7959c Mon Sep 17 00:00:00 2001
From: aarapov <aarapov>
Date: Mon, 14 Nov 2011 10:36:21 +0000
Subject:   Haiku recently dropped the _BEOS_ definition in favor of its own
 platform identification _HAIKU_, so we must now also check for it. Patch from
 Francois Revol.

---
 CHANGELOG | 5 +++++
 config.h  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c10f5f4..1907bbd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2011-11-14  Anton Arapov  <anton@redhat.com>
+
+	* Haiku dropped the _BEOS_ definition in favor of its own platform
+	  identification _HAIKU_. Patch from Francois Revol.
+
 2011-04-20  Jean Delvare  <khali@linux-fr.org>
 
 	Update to support SMBIOS specification version 2.7.1.
diff --git a/config.h b/config.h
index 52fd3c3..e39091f 100644
--- a/config.h
+++ b/config.h
@@ -6,7 +6,7 @@
 #define CONFIG_H
 
 /* Default memory device file */
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__HAIKU__)
 #define DEFAULT_MEM_DEV "/dev/misc/mem"
 #else
 #ifdef __sun
-- 
cgit v1.2.1