summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-02 18:32:49 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-02 18:32:49 +0200
commit1d5c9ae5c7c77f200e9670bbee714adad983136e (patch)
tree8ceeec1addd52fb588223a8da241e6161fdf59c6 /src/lib
parentaffea724d1810410186b10c93c64b7a8ddbe7aca (diff)
parent41aa637d3af25fc1b85047ead08bcfb90c7d57b6 (diff)
downloadouroboros-1d5c9ae5c7c77f200e9670bbee714adad983136e.tar.gz
ouroboros-1d5c9ae5c7c77f200e9670bbee714adad983136e.zip
Merged in dstaesse/ouroboros/be-malloc (pull request #53)
lib: include stdlib.h, not malloc.h
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/du_buff.c3
-rw-r--r--src/lib/flow.c2
-rw-r--r--src/lib/instance_name.c1
-rw-r--r--src/lib/shm_du_map.c2
-rw-r--r--src/lib/sockets.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/du_buff.c b/src/lib/du_buff.c
index 5345925c..5f9d6f28 100644
--- a/src/lib/du_buff.c
+++ b/src/lib/du_buff.c
@@ -21,9 +21,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
+
#include <ouroboros/du_buff.h>
#include <ouroboros/list.h>
diff --git a/src/lib/flow.c b/src/lib/flow.c
index 04166298..593bef1a 100644
--- a/src/lib/flow.c
+++ b/src/lib/flow.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <malloc.h>
+#include <stdlib.h>
#include <ouroboros/flow.h>
#define OUROBOROS_PREFIX "ipcpd/flow"
diff --git a/src/lib/instance_name.c b/src/lib/instance_name.c
index e560c0b9..634cf310 100644
--- a/src/lib/instance_name.c
+++ b/src/lib/instance_name.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <math.h>
-#include <malloc.h>
#include <stdlib.h>
instance_name_t * instance_name_create()
diff --git a/src/lib/shm_du_map.c b/src/lib/shm_du_map.c
index 74affc13..dfccca6a 100644
--- a/src/lib/shm_du_map.c
+++ b/src/lib/shm_du_map.c
@@ -25,7 +25,7 @@
#include <pthread.h>
#include <sys/mman.h>
#include <fcntl.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#define OUROBOROS_PREFIX "shm_du_map"
diff --git a/src/lib/sockets.c b/src/lib/sockets.c
index f9024f70..805dda39 100644
--- a/src/lib/sockets.c
+++ b/src/lib/sockets.c
@@ -31,7 +31,7 @@
#include <sys/un.h>
#include <sys/stat.h>
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
int client_socket_open(char * file_name)
{