(GLIBCXX_CHECK_STANDARD_LAYOUT): Fix compile check

not to redefine main.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140148 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60af9a7..d8f8b94 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-09  Andreas Schwab  <schwab@suse.de>
+
+       * acinclude.m4 (GLIBCXX_CHECK_STANDARD_LAYOUT): Fix compile check
+       not to redefine main.
+
 2008-09-07  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Check wcstoimax and

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 2485922..4936cc8 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1664,14 +1664,9 @@ AC_DEFUN([GLIBCXX_CHECK_STANDARD_LAYOUT], [
                    private:        
                    b& operator=(const b&);
                    b(const b&);
-                   };
-
-                   int main()
-                   {
-                     b tst1 = { false };
-                      return 0;
-                   }],,
-             [ac_standard_layout=yes], [ac_standard_layout=no])
+                   };],
+                [b tst1 = { false };],
+                [ac_standard_layout=yes], [ac_standard_layout=no])
 
   CXXFLAGS="$ac_save_CXXFLAGS"
   AC_LANG_RESTORE

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 1a1c418..cf0c424 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -14285,16 +14285,10 @@ struct b
                    b& operator=(const b&);
                    b(const b&);
                    };
-
-                   int main()
-                   {
-                     b tst1 = { false };
-                      return 0;
-                   }
 int
 main ()
 {
-
+b tst1 = { false };
   ;
   return 0;
 }