[llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/espresso.h getopt.c main.c

[Brian Gaeke]

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

espresso.h updated: 1.1 -> 1.2
getopt.c updated: 1.1 -> 1.2
main.c updated: 1.2 -> 1.3

---
Log message:

Make this benchmark at least compile on Solaris.


---
Diffs of the changes:  (+3 -3)

Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/espresso.h
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/espresso.h:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/espresso.h:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/espresso.h:1.1	Tue Feb 17 12:13:40 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/espresso.h	Fri Jun 25 14:32:04 2004
@@ -620,7 +620,7 @@
 /* gasp.c */	extern pcover last_gasp();
 /* gasp.c */	extern pcover super_gasp();
 /* gasp.c */	extern void expand1_gasp();
-/* getopt.c */	extern int getopt();
+/* getopt.c */	extern int espresso_getopt();
 /* hack.c */	extern find_dc_inputs();
 /* hack.c */	extern find_inputs();
 /* hack.c */	extern form_bitvector();


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/getopt.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/getopt.c:1.1 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/getopt.c:1.2
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/getopt.c:1.1	Tue Feb 17 12:13:40 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/getopt.c	Fri Jun 25 14:32:04 2004
@@ -9,7 +9,7 @@
 char	*optarg;	/* Global argument pointer. */
 int	optind = 0;	/* Global argv index. */
 
-int getopt(argc, argv, optstring)
+int espresso_getopt(argc, argv, optstring)
     int argc;
     char *argv[];
     char *optstring;


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/main.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/main.c:1.2 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/main.c:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/main.c:1.2	Mon Apr  5 13:22:14 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/espresso/main.c	Fri Jun 25 14:32:04 2004
@@ -66,7 +66,7 @@
 
 
     /* parse command line options*/
-    while ((i = getopt(argc, argv, "D:S:de:o:r:stv:x")) != EOF) {
+    while ((i = espresso_getopt(argc, argv, "D:S:de:o:r:stv:x")) != EOF) {
 	switch(i) {
 	    case 'D':		/* -Dcommand invokes a subcommand */
 		for(j = 0; option_table[j].name != 0; j++) {