From: Benjamin Kosnik <bkoz@redhat.com>
Date: Mon, 7 Feb 2011 20:06:03 +0000 (+0000)
Subject: PR libstdc++/47560 try two
X-Git-Tag: releases/gcc-4.6.0~718
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a10b8e2915e936479dbdd18a5cfe095856e50ad7;p=thirdparty%2Fgcc.git

PR libstdc++/47560 try two

2011-02-07  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/47560 try two
	* config/os/hpux/os_defines.h: Guard for C++.

From-SVN: r169897
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fd96457b9754..f21f4aec62e4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-07  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/47560 try two
+	* config/os/hpux/os_defines.h: Guard for C++.
+
 2011-02-07  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* doc/xml/faq.xml: Adjust link to bug database.
diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h
index 00100005920a..432e11697547 100644
--- a/libstdc++-v3/config/os/hpux/os_defines.h
+++ b/libstdc++-v3/config/os/hpux/os_defines.h
@@ -58,10 +58,11 @@
    We also force _GLIBCXX_USE_LONG_LONG here so that we don't have
    to bastardize configure to deal with this sillyness.  */
 
+#ifdef __cplusplus
 namespace std
 {
-_GLIBCXX_BEGIN_EXTERN_C
-
+  extern "C" 
+  {
 #ifndef __LP64__
   __extension__ long long strtoll (const char *, char **, int)
     __asm  ("__strtoll");
@@ -73,9 +74,9 @@ _GLIBCXX_BEGIN_EXTERN_C
   __extension__ unsigned long long strtoull (const char *, char **, int)
     __asm  ("strtoul");
 #endif
-
-_GLIBCXX_END_EXTERN_C
+  }
 } // namespace std
+#endif // __cplusplus
 
 #define _GLIBCXX_USE_LONG_LONG 1