diff --git a/src/global.h b/src/global.h
index 0ee712617fe4e2688f4e6f1725554e67ea6c5379..007a0ced0f6f27685551450b690ae72e40c2da11 100644
--- a/src/global.h
+++ b/src/global.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: global.h,v 1.48 2000/08/10 12:17:07 grubba Exp $
+ * $Id: global.h,v 1.49 2000/08/11 14:58:25 grubba Exp $
  */
 #ifndef GLOBAL_H
 #define GLOBAL_H
@@ -39,6 +39,13 @@
 #  define _PROTOTYPES
 #endif /* !_PROTOTYPES */
 
+/*
+ * We want to use __builtin functions.
+ */
+#ifndef __BUILTIN_VA_ARG_INCR
+#define __BUILTIN_VA_ARG_INCR	1
+#endif /* !__BUILTIN_VA_ARG_INCR */
+
 /*
  * Some structure forward declarations are needed.
  */
@@ -90,20 +97,26 @@ struct timeval;
 #endif
 
 /* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-# ifdef alloca
-#  undef alloca
-# endif
-# define alloca __builtin_alloca
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+# ifdef __GNUC__
+#  ifdef alloca
+#   undef alloca
+#  endif
+#  define alloca __builtin_alloca
+# endif 
 #else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
+# ifdef __GNUC__
+#  ifdef alloca
+#   undef alloca
+#  endif
+#  define alloca __builtin_alloca
 # else
 #  ifdef _AIX
  #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca();
 #   endif
 #  endif
 # endif