about summary refs log tree commit diff
path: root/malloc/malloc.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-08 06:31:04 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-08 06:31:04 +0000
commit67254a97d98f73a35ab995e8afccb3ded433c8b1 (patch)
tree456774aa415e12a4d77d585348a2c12e96f76e14 /malloc/malloc.h
parent7ba0e52c39ae2a57933a856ce363ab0361ad1ed9 (diff)
downloadglibc-67254a97d98f73a35ab995e8afccb3ded433c8b1.tar.gz
glibc-67254a97d98f73a35ab995e8afccb3ded433c8b1.tar.xz
glibc-67254a97d98f73a35ab995e8afccb3ded433c8b1.zip
Update.
	* malloc/malloc.h: Don't define __THROW if it is already defined.
Diffstat (limited to 'malloc/malloc.h')
-rw-r--r--malloc/malloc.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/malloc/malloc.h b/malloc/malloc.h
index ff8194f389..753539e7b0 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -1,5 +1,5 @@
 /* Prototypes and definition for malloc implementation.
-   Copyright (C) 1996,1997,1999,2000,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1996,97,99,2000,2002,2003,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -66,10 +66,12 @@
 /* GCC can always grok prototypes.  For C++ programs we add throw()
    to help it optimize the function calls.  But this works only with
    gcc 2.8.x and egcs.  */
-# if defined __cplusplus && (__GNUC__ >= 3 || __GNUC_MINOR__ >= 8)
-#  define __THROW	throw ()
-# else
-#  define __THROW
+# ifndef __THROW
+#  if defined __cplusplus && (__GNUC__ >= 3 || __GNUC_MINOR__ >= 8)
+#   define __THROW	throw ()
+#  else
+#   define __THROW
+#  endif
 # endif
 # define __MALLOC_P(args)	args __THROW
 /* This macro will be used for functions which might take C++ callback