* ld-scripts/script.t: Put .pr in .text, and .rw in .data, for

[deliverable/binutils-gdb.git] / mmalloc / mmalloc.h

diff --git a/mmalloc/mmalloc.h b/mmalloc/mmalloc.h
index 6698501ac009393efee1532cc42cac23ac514b93..030cdc2bfd8f198a03521bb23635712dd7756806 100644 (file)
--- a/mmalloc/mmalloc.h
+++ b/mmalloc/mmalloc.h
@@ -26,21 +26,8 @@ Cambridge, MA 02139, USA.
 #ifndef __MMALLOC_H
 #define __MMALLOC_H 1
 
-/* Ugly kludge to work around problem with some vendors (Sun for example)
-   that ship the ANSI <stdlib.h> file with non-ANSI compliant declarations
-   for malloc(), realloc(), calloc(), and free().  Since we don't use
-   these functions internally, but simply provide compatible replacements
-   layered on top of the m* equivalents, just hide whatever definitions
-   <stdlib.h> might supply. */
-
-#define malloc hide_malloc
-#define calloc hide_calloc
-#define realloc hide_realloc
-#define free hide_free
-
 #ifdef __STDC__
 #  include <stddef.h>
-#  include <stdlib.h>
 #  define PTR void *
 #  define CONST const
 #  define PARAMS(paramlist) paramlist
@@ -49,26 +36,20 @@ Cambridge, MA 02139, USA.
 #    define NULL (void *) 0
 #  endif
 #else
-#  undef size_t
-#  define size_t unsigned int
-#  define CHAR_BIT 8
 #  define PTR char *
 #  define CONST /* nothing */
 #  define PARAMS(paramlist) ()
+#  ifndef size_t
+#    define size_t unsigned int
+#  endif
+#  ifndef CHAR_BIT
+#    define CHAR_BIT 8
+#  endif
 #  ifndef NULL
 #    define NULL 0
 #  endif
 #endif
 
-#undef malloc  /* Undo the kludge to hide non-ANSI compliant declarations */
-#undef calloc
-#undef realloc
-#undef free
-
-#if defined(USG)
-#  include <string.h>
-#endif
-
 #ifndef MIN
 #  define MIN(A, B) ((A) < (B) ? (A) : (B))
 #endif