[llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c job.c make.h misc.c read.c

[Misha Brukman]

Changes in directory llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make:

arscan.c updated: 1.3 -> 1.4
job.c updated: 1.3 -> 1.4
make.h updated: 1.3 -> 1.4
misc.c updated: 1.3 -> 1.4
read.c updated: 1.3 -> 1.4

---
Log message:

Fix compilation on MacOS X, similar fixes as for FreeBSD.


---
Diffs of the changes:  (+14 -10)

Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.3 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.4
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.3	Fri Jun 25 03:03:11 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c	Tue Jul 20 13:24:33 2004
@@ -37,8 +37,8 @@
 #include <sys/file.h>
 #endif
 
-#if	(defined (STDC_HEADERS) || defined (__GNU_LIBRARY__) \
-	 || defined (POSIX)) || defined (__FreeBSD__)
+#if	(defined(STDC_HEADERS) || defined(__GNU_LIBRARY__) || \
+	   defined(POSIX)) || defined(__FreeBSD__) || defined(__APPLE__)
 #include <stdlib.h>
 #include <string.h>
 #define	ANSI_STRING
@@ -94,7 +94,7 @@
 #endif
 
 #if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(_IBMR2) || \
-        defined(__FreeBSD__)
+    defined(__FreeBSD__) || defined(__APPLE__)
 #include <unistd.h>
 #else
 extern int read (), open (), close (), write (), fstat ();


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.3 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.4
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.3	Fri Jun 25 03:03:11 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c	Tue Jul 20 13:24:33 2004
@@ -30,7 +30,8 @@
 /* Default shell to use.  */
 char default_shell[] = "/bin/sh";
 
-#if	defined(POSIX) || defined(__GNU_LIBRARY__) || defined(__FreeBSD__)
+#if	defined(POSIX) || defined(__GNU_LIBRARY__) || defined(__FreeBSD__) || \
+    defined(__APPLE__)
 #include <limits.h>
 #include <unistd.h>
 #define	GET_NGROUPS_MAX	sysconf (_SC_NGROUPS_MAX)
@@ -100,7 +101,8 @@
 #endif	/* WTERMSIG defined or USG and don't have <sys/wait.h>.  */
 
 
-#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__) || defined(__FreeBSD__)
+#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__) || \
+    defined(__FreeBSD__) || defined(__APPLE__)
 
 #include <sys/types.h>
 #define	GID_T	gid_t


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.3 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.4
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.3	Fri Jun 25 03:03:11 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h	Tue Jul 20 13:24:33 2004
@@ -82,8 +82,8 @@
 #endif
 
 
-#if	(defined (STDC_HEADERS) || defined (__GNU_LIBRARY__) \
-	 || defined (POSIX) || defined(__FreeBSD__))
+#if	(defined(STDC_HEADERS) || defined(__GNU_LIBRARY__) || \
+	   defined(POSIX) || defined(__FreeBSD__) || defined(__APPLE__))
 #include <stdlib.h>
 #include <string.h>
 #define	ANSI_STRING
@@ -216,7 +216,7 @@
 #endif	/* USG and don't have vfork.  */
 
 #if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__) || \
-        defined(__FreeBSD__)
+    defined(__FreeBSD__) || defined(__APPLE__)
 
 #include <unistd.h>
 #include <signal.h>


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.3 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.4
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.3	Fri Jun 25 03:03:11 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c	Tue Jul 20 13:24:33 2004
@@ -476,7 +476,8 @@
 }
 #endif
 
-#if	!defined(POSIX) && !defined(__GNU_LIBRARY__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+#if	!defined(POSIX) && !defined(__GNU_LIBRARY__) && !defined(__CYGWIN__) && \
+    !defined(__FreeBSD__) && !defined(__APPLE__)
 extern int getuid (), getgid (), geteuid (), getegid ();
 #ifdef	USG
 extern int setuid (), setgid ();


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.3 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.4
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.3	Fri Jun 25 03:03:11 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c	Tue Jul 20 13:24:33 2004
@@ -22,7 +22,8 @@
 #include "variable.h"
 
 /* This is POSIX.2, but most systems using -DPOSIX probably don't have it.  */
-#if defined(__GNU_LIBRARY__) || defined(__CYGWIN__) || defined(__FreeBSD__)
+#if defined(__GNU_LIBRARY__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
+    defined(__APPLE__)
 #include <glob.h>
 #else
 #include "glob/glob.h"