From: Sascha Wildner <saw@online.de>
Date: Tue, 26 Feb 2013 09:35:26 +0000 (+0100)
Subject: Revert "<malloc.h>: Restrict support for <malloc.h> to !defined(__STDC__)."
X-Git-Tag: v3.4.0rc~198
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/055f352b3a3efb5048e8ec081c8bfe53db574e68

Revert "<malloc.h>: Restrict support for <malloc.h> to !defined(__STDC__)."

This reverts commit 1b3342693b737646f3cab0715e31ec6ab5216b38.

It caused too many issues in the package department.

Reported-by: marino
---

diff --git a/gnu/lib/gcc47/libssp/config.h b/gnu/lib/gcc47/libssp/config.h
index f6b9088ed0..65396f9ce0 100644
--- a/gnu/lib/gcc47/libssp/config.h
+++ b/gnu/lib/gcc47/libssp/config.h
@@ -20,7 +20,7 @@
 #define HAVE_LIMITS_H 1
 
 /* Define to 1 if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
+#define HAVE_MALLOC_H 1
 
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
diff --git a/include/malloc.h b/include/malloc.h
index a6752b6363..d4407d2396 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -1,5 +1,5 @@
-#if __STDC__
-#error "this file includes <malloc.h> which is deprecated, use <stdlib.h> instead"
-#else
-#include <stdlib.h>
+#if __GNUC__
+#warning "this file includes <malloc.h> which is deprecated, use <stdlib.h> instead"
 #endif
+
+#include <stdlib.h>
diff --git a/lib/libedit/libedit/config.h b/lib/libedit/libedit/config.h
index 552f51c23a..75caf591f1 100644
--- a/lib/libedit/libedit/config.h
+++ b/lib/libedit/libedit/config.h
@@ -65,7 +65,7 @@
 #define HAVE_LIMITS_H 1
 
 /* Define to 1 if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
+#define HAVE_MALLOC_H 1
 
 /* Define to 1 if you have the `memchr' function. */
 #define HAVE_MEMCHR 1
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 5aa104a225..1fe2a2d6b2 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -97,10 +97,9 @@
  * 300302 - fpsave changes - ucontext_t, mcontext_t, sigcontext, sigframe
  * 300303 - Demarcation of old m4/flex with new m4/flex
  * 300304 - Update to dialog-1.2-20121230
- * 300305 - <malloc.h> deprecation (now errors with __STDC__)
- */
+*/
 #undef __DragonFly_version
-#define __DragonFly_version 300305	/* propagated to newvers */
+#define __DragonFly_version 300304	/* propagated to newvers */
 
 #include <sys/_null.h>
 
diff --git a/usr.bin/flex/config.h b/usr.bin/flex/config.h
index fcb1acdb86..52c97927ca 100644
--- a/usr.bin/flex/config.h
+++ b/usr.bin/flex/config.h
@@ -62,7 +62,7 @@
 #define HAVE_MALLOC 1
 
 /* Define to 1 if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
+#define HAVE_MALLOC_H 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1