Changed alloca stuff a bit: when we have a working alloca.h, we're not

2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

        * glib.h: Changed alloca stuff a bit: when we have a working
        alloca.h, we're not messing with alloca any further. Should fix a
        bug reported by Bernd Demian <wega@csc-dd.de>.

ChangeLog

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

ChangeLog.pre-2-0

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

ChangeLog.pre-2-10

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

ChangeLog.pre-2-12

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

ChangeLog.pre-2-2

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

ChangeLog.pre-2-4

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

ChangeLog.pre-2-6

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

ChangeLog.pre-2-8

@@ -1,3 +1,9 @@
+2000-10-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* glib.h: Changed alloca stuff a bit: when we have a working
+	alloca.h, we're not messing with alloca any further. Should fix a
+	bug reported by Bernd Demian <wega@csc-dd.de>.
+
 2000-09-29  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnode.c (g_node_insert_after): Added function to keep symetry

glib.h

@@ -333,30 +333,27 @@ extern "C" {
 #endif	/* __i386__ */
 
 /* g_alloca handling */
-#ifdef GLIB_HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include <string.h>
 #ifdef  __GNUC__
-/* glibc already does this for us */
+/* GCC does the right thing */
-#ifndef alloca
+# undef alloca
 # define alloca(size)   __builtin_alloca (size)
-#endif
+#elif defined (GLIB_HAVE_ALLOCA_H)
-#else
+/* a native and working alloca.h is there */ 
+# include <alloca.h>
+#else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
 # ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
-# else
+# else /* !_MSC_VER */
 #  ifdef _AIX
  #pragma alloca
-#   else
+#  else /* !_AIX */
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
-#    endif
+#   endif /* !alloca */
-#   endif
+#  endif /* !_AIX */
-# endif
+# endif /* !_MSC_VER */
-#endif
+#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
 
 #define g_alloca(size) alloca (size)
 /* End g_alloca handling */

glib/glib.h

@@ -333,30 +333,27 @@ extern "C" {
 #endif	/* __i386__ */
 
 /* g_alloca handling */
-#ifdef GLIB_HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include <string.h>
 #ifdef  __GNUC__
-/* glibc already does this for us */
+/* GCC does the right thing */
-#ifndef alloca
+# undef alloca
 # define alloca(size)   __builtin_alloca (size)
-#endif
+#elif defined (GLIB_HAVE_ALLOCA_H)
-#else
+/* a native and working alloca.h is there */ 
+# include <alloca.h>
+#else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
 # ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
-# else
+# else /* !_MSC_VER */
 #  ifdef _AIX
  #pragma alloca
-#   else
+#  else /* !_AIX */
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
-#    endif
+#   endif /* !alloca */
-#   endif
+#  endif /* !_AIX */
-# endif
+# endif /* !_MSC_VER */
-#endif
+#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
 
 #define g_alloca(size) alloca (size)
 /* End g_alloca handling */