From 2c202400a4a483ce03508b81e59372d83fe9903c Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Mon, 1 Apr 2002 16:27:06 +0000
Subject: 	Darwin/OS portability from Max Horn <max@quendi.de>

	* src/libical/icallangbind.c: #include <stdlib.h>, not <malloc.h>

	* src/libicalvcal/vobject.c: Likewise

	* src/libicalvcal/vcc.y: Likewise

	* src/libicalss/icaldirset.c: Rearrange #includes slightly to make
	Darwin happy.

svn path=/trunk/; revision=16307
---
 libical/src/libical/icallangbind.c | 2 +-
 libical/src/libicalss/icaldirset.c | 2 +-
 libical/src/libicalvcal/vcc.y      | 3 ---
 libical/src/libicalvcal/vobject.c  | 5 +----
 4 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'libical/src')

diff --git a/libical/src/libical/icallangbind.c b/libical/src/libical/icallangbind.c
index 866eb700cc..c78638985f 100644
--- a/libical/src/libical/icallangbind.c
+++ b/libical/src/libical/icallangbind.c
@@ -22,7 +22,7 @@
 #include "icalproperty.h"
 #include "icalerror.h"
 #include "icalmemory.h"
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 int* icallangbind_new_array(int size){
diff --git a/libical/src/libicalss/icaldirset.c b/libical/src/libicalss/icaldirset.c
index 3a7b9cfdd9..f5da125459 100644
--- a/libical/src/libicalss/icaldirset.c
+++ b/libical/src/libicalss/icaldirset.c
@@ -66,9 +66,9 @@
 #include "icalgauge.h"
 
 #include <limits.h> /* For PATH_MAX */
-#include <dirent.h> /* for opendir() */
 #include <errno.h>
 #include <sys/types.h> /* for opendir() */
+#include <dirent.h> /* for opendir() */
 #include <sys/stat.h> /* for stat */
 #include <unistd.h> /* for stat, getpid */
 #include <time.h> /* for clock() */
diff --git a/libical/src/libicalvcal/vcc.y b/libical/src/libicalvcal/vcc.y
index 4397198b1b..95d5858d81 100644
--- a/libical/src/libicalvcal/vcc.y
+++ b/libical/src/libicalvcal/vcc.y
@@ -107,9 +107,6 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #endif
 
 #include <string.h>
-#ifndef __MWERKS__
-#include <malloc.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/libical/src/libicalvcal/vobject.c b/libical/src/libicalvcal/vobject.c
index d685b04278..b17830eb72 100644
--- a/libical/src/libicalvcal/vobject.c
+++ b/libical/src/libicalvcal/vobject.c
@@ -42,11 +42,8 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
  * vobject, and convert a vobject into its textual representation.
  */
 
-#ifndef	 MWERKS
-#include <malloc.h>
-#endif
-
 #include "vobject.h"
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
-- 
cgit v1.2.3