From 12247c671371cd7f5466beb96db8ade8b12406d9 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Thu, 21 May 2009 07:23:02 +0000
Subject: [PATCH] Fix compilation issues on OS X - mainly #include file changes
 (Lars Immisch)

---
 include/mISDNif.h        | 6 ++++++
 include/openbsc/paging.h | 2 +-
 include/vty/buffer.h     | 2 ++
 include/vty/command.h    | 1 +
 src/abis_nm.c            | 2 +-
 src/gsm_utils.c          | 2 +-
 src/signal.c             | 2 +-
 src/telnet_interface.c   | 2 +-
 tests/db/db_test.c       | 2 +-
 9 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/include/mISDNif.h b/include/mISDNif.h
index a4ef7f691..8e065d24b 100644
--- a/include/mISDNif.h
+++ b/include/mISDNif.h
@@ -19,9 +19,15 @@
 #define mISDNIF_H
 
 #include <stdarg.h>
+#ifdef linux
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/socket.h>
+#else
+#include <sys/types.h>
+#include <sys/errno.h>
+#include <sys/socket.h>
+#endif
 
 /*
  * ABI Version 32 bit
diff --git a/include/openbsc/paging.h b/include/openbsc/paging.h
index fd9dc02e8..de512d1ae 100644
--- a/include/openbsc/paging.h
+++ b/include/openbsc/paging.h
@@ -21,7 +21,7 @@
 #ifndef PAGING_H
 #define PAGING_H
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "linuxlist.h"
diff --git a/include/vty/buffer.h b/include/vty/buffer.h
index 87cb3fde4..31519400f 100644
--- a/include/vty/buffer.h
+++ b/include/vty/buffer.h
@@ -23,6 +23,8 @@
 #ifndef _ZEBRA_BUFFER_H
 #define _ZEBRA_BUFFER_H
 
+#include <sys/types.h>
+
 /* Create a new buffer.  Memory will be allocated in chunks of the given
    size.  If the argument is 0, the library will supply a reasonable
    default size suitable for buffering socket I/O. */
diff --git a/include/vty/command.h b/include/vty/command.h
index f72ea6c04..26022cb02 100644
--- a/include/vty/command.h
+++ b/include/vty/command.h
@@ -24,6 +24,7 @@
 #define _ZEBRA_COMMAND_H
 
 #include <stdio.h>
+#include <sys/types.h>
 #include "vector.h"
 #include "vty.h"
 
diff --git a/src/abis_nm.c b/src/abis_nm.c
index 9820d974b..6909f7828 100644
--- a/src/abis_nm.c
+++ b/src/abis_nm.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <libgen.h>
 #include <time.h>
 #include <limits.h>
diff --git a/src/gsm_utils.c b/src/gsm_utils.c
index b0594aec3..0c25b28c6 100644
--- a/src/gsm_utils.c
+++ b/src/gsm_utils.c
@@ -22,7 +22,7 @@
  */
 
 #include <openbsc/gsm_utils.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 /* GSM 03.38 6.2.1 Charachter packing */
diff --git a/src/signal.c b/src/signal.c
index a7fc28ec1..4227c6dc1 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -19,7 +19,7 @@
  */
 
 #include <openbsc/signal.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 
diff --git a/src/telnet_interface.c b/src/telnet_interface.c
index 5ed9a0e26..d812b17df 100644
--- a/src/telnet_interface.c
+++ b/src/telnet_interface.c
@@ -20,7 +20,7 @@
 
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/tests/db/db_test.c b/tests/db/db_test.c
index 93bf15235..bbca58585 100644
--- a/tests/db/db_test.c
+++ b/tests/db/db_test.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #define COMPARE(original, copy) \
 	if (original->id != copy->id) \