diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2011-02-07 20:06:03 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2011-02-07 20:06:03 +0000 |
| commit | a10b8e2915e936479dbdd18a5cfe095856e50ad7 (patch) | |
| tree | a53c74fc312f211185d034b25319c7dc52654b77 | |
| parent | 0f4e946fbde9a242f9021310e06dbb1d7bc3583d (diff) | |
| download | gcc-a10b8e2915e936479dbdd18a5cfe095856e50ad7.zip gcc-a10b8e2915e936479dbdd18a5cfe095856e50ad7.tar.gz gcc-a10b8e2915e936479dbdd18a5cfe095856e50ad7.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/os/hpux/os_defines.h | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fd96457..f21f4ae 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 0010000..432e116 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 |