From b5010caaa4606ea37df9cd1334dc99fff05a8bd3 Mon Sep 17 00:00:00 2001
From: fredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Date: Wed, 11 Apr 2007 02:26:54 +0000
Subject: [PATCH] Removed every instance of malloc.h.

git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@878 959494ce-11ee-0310-bf91-de5d638817bd
---
 clients/gtk2/main.c | 2 +-
 common/utils.c      | 2 +-
 daemon/client.c     | 1 -
 daemon/conf.c       | 3 ++-
 daemon/fnet-dc.c    | 1 -
 daemon/log.c        | 2 +-
 daemon/search.c     | 1 -
 daemon/ui.c         | 1 -
 include/utils.h     | 1 -
 lib/uimisc.c        | 1 -
 lib/utils.c         | 2 +-
 11 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/clients/gtk2/main.c b/clients/gtk2/main.c
index 852ee59..bd0cdda 100644
--- a/clients/gtk2/main.c
+++ b/clients/gtk2/main.c
@@ -21,10 +21,10 @@
  * inability to structure GUI programs properly. Looking at it too
  * closely may cause ocular hemorrhaging. */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <malloc.h>
 #include <stdarg.h>
 #include <gtk/gtk.h>
 #include <sys/socket.h>
diff --git a/common/utils.c b/common/utils.c
index 5c909ec..e3178d5 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
diff --git a/daemon/client.c b/daemon/client.c
index 5b080fb..adf9be5 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -18,7 +18,6 @@
 */
 #include <stdlib.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <wchar.h>
 #include <string.h>
 #include <errno.h>
diff --git a/daemon/conf.c b/daemon/conf.c
index 437ce09..c4c585c 100644
--- a/daemon/conf.c
+++ b/daemon/conf.c
@@ -16,10 +16,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
+#include <stdlib.h>
 #include <langinfo.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <string.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 7757885..c88deef 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
-#include <malloc.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/daemon/log.c b/daemon/log.c
index 49a444c..61c7638 100644
--- a/daemon/log.c
+++ b/daemon/log.c
@@ -16,12 +16,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+#include <stdlib.h>
 #include <syslog.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/uio.h>
 #include <string.h>
-#include <malloc.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/daemon/search.c b/daemon/search.c
index 7b61d42..1aec9c0 100644
--- a/daemon/search.c
+++ b/daemon/search.c
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <stdlib.h>
-#include <malloc.h>
 #include <wchar.h>
 #include <wctype.h>
 #include <errno.h>
diff --git a/daemon/ui.c b/daemon/ui.c
index f947379..d77efa7 100644
--- a/daemon/ui.c
+++ b/daemon/ui.c
@@ -19,7 +19,6 @@
 #define _GNU_SOURCE
 #include <unistd.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
diff --git a/include/utils.h b/include/utils.h
index a8b5a08..3e41b8b 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -21,7 +21,6 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include <malloc.h>
 #ifdef DAEMON
 #include "log.h"
 #endif
diff --git a/lib/uimisc.c b/lib/uimisc.c
index 9b6e03f..4232453 100644
--- a/lib/uimisc.c
+++ b/lib/uimisc.c
@@ -27,7 +27,6 @@
 #include <wctype.h>
 #include <pwd.h>
 #include <string.h>
-#include <malloc.h>
 #include <stdio.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/utils.c b/lib/utils.c
index f5cd7d0..e203a56 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
-- 
2.11.0