Attachment 8291 Details for Bug 9537 – Patch for xproto

[patch] Patch for xproto

xproto-X11R7.1-7.0.5.patch (text/plain), 2.41 KB, created by Peter O'Gorman, The Written Word, Inc. on 2007-01-04 07:17:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter O'Gorman, The Written Word, Inc.

Created: 2007-01-04 07:17:36 UTC

Size: 2.41 KB

patch

obsolete

>Index: Xalloca.h
>===================================================================
>--- Xalloca.h.orig	2005-07-16 15:54:13.000000000 -0500
>+++ Xalloca.h	2006-12-20 09:16:22.362076000 -0600
>@@ -61,15 +61,19 @@
> #ifndef XALLOCA_H
> #define XALLOCA_H 1
> 
>-#ifndef INCLUDE_ALLOCA_H
>-# if defined(__SUNPRO_C)  /* Need to add more here to match Imake *.cf's */
>-#  define INCLUDE_ALLOCA_H
>-# endif
>-#endif
>-
> #ifdef INCLUDE_ALLOCA_H
> #  include <alloca.h>
> #endif
>+#ifdef _AIX
>+#pragma alloca
>+#define ALLOCATE_LOCAL(size)	alloca(size)
>+#define NO_ALLOCA
>+#endif
>+#ifdef sun
>+#include <alloca.h>
>+#define ALLOCATE_LOCAL(size)	alloca(size)
>+#define NO_ALLOCA
>+#endif
> 
> #ifndef NO_ALLOCA
> /*
>Index: configure.ac
>===================================================================
>--- configure.ac.orig	2006-04-26 18:26:49.000000000 -0500
>+++ configure.ac	2007-01-01 19:39:30.577221000 -0600
>@@ -35,6 +35,10 @@
> # Handle Xpoll.h.in
> fds_bits_found=false;
> 
>+AC_CHECK_HEADER([sys/select.h],[XPOLL_SYS_SELECT_H=1
>+AC_DEFINE([HAVE_SYS_SELECT_H],[1],[define if you can #include <sys/select.h>])],
>+[XPOLL_SYS_SELECT_H=0])
>+AC_SUBST([XPOLL_SYS_SELECT_H])
> if test "x$fds_bits_found" = xfalse ; then
>    AC_CHECK_MEMBER(fd_set.fds_bits, 
> 			   [
>@@ -43,7 +47,10 @@
> 			   ],,
> 			   [
>                                #include <sys/types.h>
>+#ifdef HAVE_SYS_SELECT_H
> 			       #include <sys/select.h>
>+#endif
>+			       #include <sys/time.h>
> 			   ])
> fi
> 
>@@ -55,10 +62,12 @@
> 			],,
> 			[
>                             #include <sys/types.h>
>+#ifdef HAVE_SYS_SELECT_H
> 			    #include <sys/select.h>
>+#endif
>+			    #include <sys/time.h>
> 			])
> fi
>-
> if test "x$fds_bits_found" = xfalse ; then
>     AC_MSG_ERROR([Could not determine how to access the fds_bits or equivalent
>                   structure in fd_set on your platform.])
>@@ -169,7 +178,6 @@
> if test "x$WIDEPROTO" = xno; then
> 	AC_DEFINE(NARROWPROTO, [], [Narrow prototypes])
> fi
>-
> XORG_RELEASE_VERSION
> 
> AC_OUTPUT([Makefile
>Index: Xpoll.h.in
>===================================================================
>--- Xpoll.h.in.orig	2005-07-22 03:01:39.000000000 -0500
>+++ Xpoll.h.in	2006-12-20 09:16:22.436818000 -0600
>@@ -78,7 +78,9 @@
> #   ifdef __QNX__  /* Make sure we get 256 bit select masks */
> #    define FD_SETSIZE 256
> #   endif
>+#if @XPOLL_SYS_SELECT_H@ /* Have sys/select.h if 1, not if 0 */
> #   include <sys/select.h>
>+#endif
> #  endif
> # endif
> #else /* DGUX  -- No sys/select in Intel DG/ux */

Actions: View | Splinter Review

Attachments on bug 9537: 8291

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.