[xserver-commit] xserver/include os.h,3.47,3.47.2.1

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv2700/include

Modified Files:
      Tag: xfixes_2_branch
	os.h 
Log Message:
	* hw/kdrive/mach64/mach64.c: (mach64ScreenInit):
	Function pointer initializers in wrong order (oops)
	* hw/kdrive/src/kshadow.c: (KdShadowSet):
	Missing return value
	* include/os.h:
	Not obeying autoconf HAVE_ALLOCA_H all of the time.


Index: os.h
===================================================================
RCS file: /cvs/xserver/xserver/include/os.h,v
retrieving revision 3.47
retrieving revision 3.47.2.1
diff -u -d -r3.47 -r3.47.2.1
--- os.h	29 Sep 2003 01:42:40 -0000	3.47
+++ os.h	25 Oct 2003 05:44:47 -0000	3.47.2.1
@@ -53,16 +53,14 @@
 #include "misc.h"
 #if HAVE_ALLOCA
 /* AIX requires this to be the first thing in the file.  */
-# ifndef __GNUC__
-#  if HAVE_ALLOCA_H
+# if HAVE_ALLOCA_H
 #   include <alloca.h>
-#  else
-#   ifdef _AIX
+# else
+#  ifdef _AIX
  #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif