[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getargs.c getopt.c

[Brian Gaeke]

Changes in directory llvm-test/MultiSource/Benchmarks/Prolangs-C/bison:

getargs.c updated: 1.1 -> 1.2
getopt.c updated: 1.1 -> 1.2
---
Log message:

Hacks to make more Prolangs-C benchmarks work under Solaris:
* Include -lsocket -lnsl for socket-using programs
* Don't include (prototypes for) getopt that conflict(s) with system's
  (prototype)
 


---
Diffs of the changes:  (+4 -0)

Index: llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getargs.c
diff -u llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getargs.c:1.1 llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getargs.c:1.2
--- llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getargs.c:1.1	Tue Oct  5 13:31:50 2004
+++ llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getargs.c	Thu Dec  9 18:18:22 2004
@@ -28,7 +28,9 @@
 extern int fixed_outfiles;/* JF */
 
 extern void fatal(char *s);
+#ifndef __sun__
 extern int getopt(int argc,char **argv,char *optstring);
+#endif
 
 void getargs(int argc,char *argv[])
 {


Index: llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getopt.c
diff -u llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getopt.c:1.1 llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getopt.c:1.2
--- llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getopt.c:1.1	Tue Oct  5 13:31:50 2004
+++ llvm-test/MultiSource/Benchmarks/Prolangs-C/bison/getopt.c	Thu Dec  9 18:18:22 2004
@@ -261,6 +261,7 @@
    non-option ARGV-elements.  See the comments about RETURN_IN_ORDER, above. 
 */
 
+#ifndef __sun__
 int getopt(int argc,char **argv,char *optstring)
 {
   /* Initialize the internal data when the first call is made.
@@ -422,6 +423,7 @@
     return c;
   }
 }
+#endif /* __sun__ */
 
 #ifdef TEST