Include stdio.h. Test STDC_HEADERS, not __STDC__.

2 files changed, 16 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d3ea1be941d..7d191333750 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2000-03-28  Dave Love  <fx@gnu.org>
+
+        * alloc.c: Include stdio.h.  Test STDC_HEADERS, not __STDC__.
+
+2000-03-27  gerd  <gerd@dlpx1>
+
+        * alloc.c (mark_maybe_object): New function.
+        (mark_memory): Use it.
+        (SETJMP_WILL_LIKELY_WORK, SETJMP_WILL_NOT_WORK): New macros.
+        (setjmp_tested_p, longjmp_done): New variables.
+        (test_setjmp): New function.
+        (mark_stack) [!GC_SETJMP_WORKS]: Call test_setjmp.
+        (init_alloc): Initialize setjmp_tested_p and longjmp_done.
+
 2000-03-27  Stefan Monnier  <monnier@cs.yale.edu>
 
         * regex.c (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as
diff --git a/src/alloc.c b/src/alloc.c
index 9b82d45a0bf..d7e4214c6c4 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -20,6 +20,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
+#include <stdio.h>
 
 /* Note that this declares bzero on OSF/1.  How dumb.  */
 
@@ -58,7 +59,7 @@ extern char *sbrk ();
 
 /* The following come from gmalloc.c.  */
 
-#if defined (__STDC__) && __STDC__
+#if defined (STDC_HEADERS)
 #include <stddef.h>
 #define __malloc_size_t         size_t
 #else