summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraarapov <aarapov>2011-11-14 10:36:21 +0000
committeraarapov <aarapov>2011-11-14 10:36:21 +0000
commit208dc2cb51ffbe6ca049e37c0e201c101bd7959c (patch)
tree843aace5a907c964c85ac579065797d4537bbaf1
parent6549220d241b1dc5e70c1df6c59e0fac6c55baaa (diff)
downloaddmidecode-208dc2cb51ffbe6ca049e37c0e201c101bd7959c.tar.gz
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.
-rw-r--r--CHANGELOG5
-rw-r--r--config.h2
2 files changed, 6 insertions, 1 deletions
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