1999-02-19 Ben Elliston <bje@cygnus.com>

	* config.guess: Make C code clean for C++ compilers. Contributed
	by Markus Oberhumer <k3040e4@c210.edvz.uni-linz.ac.at>.

diff --git a/ChangeLog b/ChangeLog
index afce07d67c794a0e85daecdb1cd08667ce76ad95..d22435847076b5ecd2bb5c9bec1fa1fc2799e981 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-02-19  Ben Elliston  <bje@cygnus.com>
+
+       * config.guess: Make C code clean for C++ compilers. Contributed
+       by Markus Oberhumer <k3040e4@c210.edvz.uni-linz.ac.at>.
+
 1999-02-19  Ben Elliston <bje@cygnus.com>
        
        * config.guess: Automatically recognise ELF on FreeBSD. From Niall

diff --git a/config.guess b/config.guess
index b5a39ae07397fcea151181b74508eb01fb33d32c..2bbf5bfbd1241604c98aa0d8e4a5f53b8b9f5357 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -241,7 +241,11 @@ EOF
        exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
        sed 's/^        //' << EOF >$dummy.c
-       int main (argc, argv) int argc; char **argv; {
+#ifdef __cplusplus
+       int main (int argc, char *argv[]) {
+#else
+       int main (argc, argv) int argc; char *argv[]; {
+#endif
        #if defined (host_mips) && defined (MIPSEB)
        #if defined (SYSTYPE_SYSV)
          printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -630,10 +634,11 @@ EOF
                echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
        elif test "${UNAME_MACHINE}" = "mips" ; then
          cat >$dummy.c <<EOF
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+#ifdef __cplusplus
+       int main (int argc, char *argv[]) {
+#else
+       int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
@@ -665,10 +670,11 @@ EOF
          # Determine whether the default compiler is a.out or elf
          cat >$dummy.c <<EOF
 #include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+#ifdef __cplusplus
+       int main (int argc, char *argv[]) {
+#else
+       int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2