2008-04-23  Benjamin Kosnik  <bkoz@redhat.com>

	    * config/os/hpux/os_defines.h: Use _GLIBCXX_BEGIN_NAMESPACE,
	    _GLIBCXX_BEGIN_EXTERN_C, etc.

Index: config/os/hpux/os_defines.h
===================================================================
--- config/os/hpux/os_defines.h	(revision 134599)
+++ config/os/hpux/os_defines.h	(working copy)
@@ -1,6 +1,6 @@
 // Specific definitions for HPUX  -*- C++ -*-
 
-// Copyright (C) 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002, 2004, 2005, 2008 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
@@ -61,21 +61,26 @@
 
    We also force _GLIBCXX_USE_LONG_LONG here so that we don't have
    to bastardize configure to deal with this sillyness.  */
-namespace std 
-{
+
+_GLIBCXX_BEGIN_NAMESPACE(std)
+_GLIBCXX_BEGIN_EXTERN_C
+
 #ifndef __LP64__
-  __extension__ extern "C" long long strtoll (const char *, char **, int)
+  __extension__ long long strtoll (const char *, char **, int)
     __asm  ("__strtoll");
-  __extension__ extern "C" unsigned long long strtoull (const char *, char **, int)
+  __extension__ unsigned long long strtoull (const char *, char **, int)
     __asm  ("__strtoull");
 #else
-  __extension__ extern "C" long long strtoll (const char *, char **, int)
+  __extension__ long long strtoll (const char *, char **, int)
     __asm  ("strtol");
-  __extension__ extern "C" unsigned long long strtoull (const char *, char **, int)
+  __extension__ unsigned long long strtoull (const char *, char **, int)
     __asm  ("strtoul");
 #endif
-}
 
+_GLIBCXX_END_EXTERN_C
+_GLIBCXX_END_NAMESPACE
+
+
 #define _GLIBCXX_USE_LONG_LONG 1
 
 // HPUX on IA64 requires vtable to be 64 bit aligned even at 32 bit