* include/bits/functexcept.h: Add guards.
* acinclude.m4 (GLIBCXX_ENABLE_THREADS): Tweak test.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88857
138bc75d-0d04-0410-961f-
82ee72b054a4
+2004-10-10 Benjamin Kosnik <bkoz@redhat.com>
+
+ * include/bits/functexcept.h: Add guards.
+
+ * acinclude.m4 (GLIBCXX_ENABLE_THREADS): Tweak test.
+ * configure: Regenerate.
+
2004-10-10 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/monetary_members.cc (_S_construct_pattern):
target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
AC_MSG_RESULT([$target_thread_file])
- enable_thread=no
if test $target_thread_file != single; then
AC_DEFINE(HAVE_GTHR_DEFAULT)
- enable_thread=yes
fi
glibcxx_thread_h=gthr-$target_thread_file.h
+
+ dnl Check for __GTHREADS define.
+ gthread_file=${toplevel_srcdir}/gcc/${glibcxx_thread_h}
+ if grep __GTHREADS $gthread_file >/dev/null 2>&1 ; then
+ enable_thread=yes
+ else
+ enable_thread=no
+ fi
+
AC_SUBST(glibcxx_thread_h)
])
echo "$as_me:$LINENO: result: $target_thread_file" >&5
echo "${ECHO_T}$target_thread_file" >&6
- enable_thread=no
if test $target_thread_file != single; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_GTHR_DEFAULT 1
_ACEOF
- enable_thread=yes
fi
glibcxx_thread_h=gthr-$target_thread_file.h
+ gthread_file=${toplevel_srcdir}/gcc/${glibcxx_thread_h}
+ if grep __GTHREADS $gthread_file >/dev/null 2>&1 ; then
+ enable_thread=yes
+ else
+ enable_thread=no
+ fi
+
+
# Check whether --enable-concept-checks or --disable-concept-checks was given.
// Function-Based Exception Support -*- C++ -*-
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// ISO C++ 14882: 19.1 Exception classes
//
+#ifndef _FUNCTEXCEPT_H
+#define _FUNCTEXCEPT_H 1
+
#include <exception_defines.h>
namespace std
__throw_ios_failure(const char* __s);
} // namespace std
+#endif