From: Ben Elliston <bje+keyword+gnu.7caf74@air.net.au>
Date: Sun, 21 Feb 1999 16:49:04 +0000 (+0000)
Subject: 1999-02-19  Ben Elliston  <bje@cygnus.com>
X-Git-Tag: experimental-branchpoint~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=244a68a02192b1ba1518ca5ff69f679434e1dc16;p=thirdparty%2Fautoconf.git

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 afce07d6..d2243584 100644
--- 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 b5a39ae0..2bbf5bfb 100755
--- 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