summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-05-28 21:01:52 +0000
committerRoland McGrath <roland@gnu.org>2003-05-28 21:01:52 +0000
commit862ef982729737b873b52039714ca7b4b43b4c72 (patch)
treed8126bdd139a48696a64975547fc6de5d9a36f84
parentfe2dcbcca121c0193cbaef35573a651f975cb156 (diff)
downloadglibc-862ef982729737b873b52039714ca7b4b43b4c72.tar.gz
glibc-862ef982729737b873b52039714ca7b4b43b4c72.tar.xz
glibc-862ef982729737b873b52039714ca7b4b43b4c72.zip
* malloc/malloc.h [! __GNUC__] (__const): Define if undefined.
-rw-r--r--ChangeLog4
-rw-r--r--malloc/malloc.h10
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e12c0ded3..7433787d26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-28  Roland McGrath  <roland@redhat.com>
+
+	* malloc/malloc.h [! __GNUC__] (__const): Define if undefined.
+
 2003-05-26  Aldy Hernandez  <aldyh@redhat.com>
 
 	* soft-fp/soft-fp.h (FP_EX_UNDERFLOW): Define to 0.
diff --git a/malloc/malloc.h b/malloc/malloc.h
index bbcdf22b23..868a2f6fc3 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 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1999,2000,2002,2003 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
@@ -85,11 +85,19 @@
 #  define __MALLOC_P(args)	args
 #  define __MALLOC_PMT(args)	args
 
+#  ifndef __const
+#   define __const	 const
+#  endif
+
 # else	/* Not ANSI C or C++.  */
 
 #  define __MALLOC_P(args)	()	/* No prototypes.  */
 #  define __MALLOC_PMT(args)	()
 
+#  ifndef __const
+#   define __const
+#  endif
+
 # endif	/* ANSI C or C++.  */
 
 #endif	/* GCC.  */