hal: Branch 'master'

[David Zeuthen]

 hald/cache_test.c   |    2 +-
 hald/create_cache.c |    2 +-
 hald/hald.c         |    6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
diff-tree e23764b2828274cbc7d4c32570cfba8b9c661903 (from 81aa6e39d309d3cdba216f8076e3b5260fb4bcfa)
Author: Doug Goldstein <cardoe at gentoo.org>
Date:   Thu Apr 12 16:00:56 2007 -0400

    use stdlib.h not malloc.h
    
    Doug Goldstein wrote:
    > malloc.h is deprecated for stdlib.h, FreeBSD 6.2 is enforcing this a bit
    > stronger now apparently. This patch fixes up it's usage.
    >
    
    new and improved.
    
    added as necessary...
    
    mallopt... is... ugh.. but that's something totally different..

diff --git a/hald/cache_test.c b/hald/cache_test.c
index deb1f72..76ac8bb 100644
--- a/hald/cache_test.c
+++ b/hald/cache_test.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <errno.h>
 #include <expat.h>
diff --git a/hald/create_cache.c b/hald/create_cache.c
index eed9a14..35b4a46 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -34,8 +34,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <dirent.h>
-#include <malloc.h>
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>
diff --git a/hald/hald.c b/hald/hald.c
index a597de8..240bb07 100644
--- a/hald/hald.c
+++ b/hald/hald.c
@@ -30,6 +30,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
+#ifdef HAVE_MALLOPT
+#include <malloc.h>
+#endif
+
 #include <string.h>
 #include <unistd.h>
 #include <getopt.h>
@@ -43,7 +48,6 @@
 #include <syslog.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <malloc.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>