os_defines.h: Use _GLIBCXX_BEGIN_NAMESPACE, _GLIBCXX_BEGIN_EXTERN_C, etc.

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

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

From-SVN: r134607
This commit is contained in:
Benjamin Kosnik 2008-04-23 23:28:45 +00:00 committed by Benjamin Kosnik
parent 10a9ad3b82
commit cb45715664
3 changed files with 46 additions and 22 deletions

View file

@ -1,3 +1,8 @@
2008-04-23 Benjamin Kosnik <bkoz@redhat.com>
* config/os/hpux/os_defines.h: Use _GLIBCXX_BEGIN_NAMESPACE,
_GLIBCXX_BEGIN_EXTERN_C, etc.
2008-04-23 Johannes Singler <singler@ira.uka.de>
* include/parallel/quicksort.h: Reformat,

View file

@ -719,6 +719,21 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of a `char', as computed by sizeof. */
#undef SIZEOF_CHAR
/* The size of a `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of a `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of a `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* The size of a `void *', as computed by sizeof. */
#undef SIZEOF_VOID_P
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

View file

@ -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,20 +61,24 @@
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