x11proto-core: Changes to 'upstream-unstable'
Xalloca.h | 9 ++++-----
Xos.h | 2 +-
Xos_r.h | 2 +-
Xosdefs.h | 4 ++--
Xpoll.h.in | 2 +-
configure.ac | 28 +++++++++++++++++++++++++---
6 files changed, 34 insertions(+), 13 deletions(-)
New commits:
commit d34310efef11264ddff79320b8c6f03705b1208a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 5 22:09:16 2008 -0500
x11proto 7.0.12
diff --git a/configure.ac b/configure.ac
index 9806ae3..f62d508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Feb 10 19:07:49 2008 -0800
Fixed #ifdef checks that were using i386 to use __i386__
"""
It's simply obsolete, sloppy, compiler namespace pollution. The
compiler is not allowed to predefine symbols that might conflict with
ordinary identifiers. For backwards compatibility gcc currently
predefines i386 when compiling for x86 32-bit (but not 64-bit), but that
will go away. It is also not defined if you specify -ansi when invoking
the compiler, because then it is seriously standards compliant. Other
compilers shouldn't define it either. Correct code shouldn't rely on it
being defined. However __i386__ is safe and proper.
"""
diff --git a/Xos.h b/Xos.h
index b6b93a5..67bf679 100644
--- a/Xos.h
+++ b/Xos.h
@@ -149,7 +149,7 @@ extern int sys_nerr;
*/
#if defined(X_NOT_POSIX)
#include <fcntl.h>
-#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
+#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(__i386__) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
#include <unistd.h>
#endif
#ifdef WIN32
diff --git a/Xos_r.h b/Xos_r.h
index f52bde7..7ce72ac 100644
--- a/Xos_r.h
+++ b/Xos_r.h
@@ -237,7 +237,7 @@ extern void XtProcessUnlock(
#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
/* Use regular, unsafe API. */
-# if defined(X_NOT_POSIX) && !defined(i386) && !defined(SYSV)
+# if defined(X_NOT_POSIX) && !defined(__i386__) && !defined(SYSV)
extern struct passwd *getpwuid(), *getpwnam();
# endif
typedef int _Xgetpwparams; /* dummy */
diff --git a/Xosdefs.h b/Xosdefs.h
index be90d5e..14971c4 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -86,7 +86,7 @@ in this Software without prior written authorization from The Open Group.
#endif
#endif
-#ifdef i386
+#ifdef __i386__
#ifdef SYSV
#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
!defined(__UNIXWARE__) && !defined(sun)
commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 21:33:01 2007 -0800
Changed __DARWIN__ to __APPLE__
diff --git a/Xosdefs.h b/Xosdefs.h
index 075d798..be90d5e 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -133,7 +133,7 @@ in this Software without prior written authorization from The Open Group.
#define NULL_NOT_ZERO
#endif
-#ifdef __DARWIN__
+#ifdef __APPLE__
#define NULL_NOT_ZERO
#endif
commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 30 18:44:49 2007 -0700
Make Xalloca.h work with Sun C++ compiler
diff --git a/Xalloca.h b/Xalloca.h
index 67f2671..c561718 100644
--- a/Xalloca.h
+++ b/Xalloca.h
@@ -62,7 +62,8 @@ from The Open Group.
#define XALLOCA_H 1
#ifndef INCLUDE_ALLOCA_H
-# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */
+/* Need to add more here to match Imake *.cf's */
+# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define INCLUDE_ALLOCA_H
# endif
#endif
@@ -111,16 +112,14 @@ from The Open Group.
* decide that you don't want to use alloca, you might want to fix it here.
*/
/* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-# ifndef __sgi /* IRIX 5/6 has definition */
-# ifndef __QNX__
+# if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus)
# define __Xnullarg /* as nothing */
# ifndef X_NOT_STDC_ENV
extern void *alloca(__Xnullarg);
# else
extern char *alloca(__Xnullarg);
# endif
-# endif /* __QNX__ */
-# endif /* __sgi */
+# endif /* !__sgi && !__QNX && !__cplusplus */
# define ALLOCATE_LOCAL(size) alloca((int)(size))
# endif /* who does alloca */
# endif /* NCR */
commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Oct 30 18:40:47 2007 -0700
fd_mask needs to be defined on OS X, too
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 33fdad4..3940489 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -91,7 +91,7 @@ from The Open Group.
#ifdef CSRG_BASED
#include <sys/param.h>
-# if BSD < 199103
+# if BSD < 199103 || defined(__APPLE__)
typedef long fd_mask;
# endif
#endif
commit 8be48ca399c3efd0e5d59f53da1b37d02647f33b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 24 12:28:25 2007 +0300
Check headers before testing for fds_bits access method (bug #8442)
HP-UX doesn't have sys/select.h, so make sure we don't overzealously include
headers when we try to find out how to use fds_bits.
diff --git a/configure.ac b/configure.ac
index 21479e4..9806ae3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ AC_ARG_ENABLE(wide-prototypes,
[WIDEPROTO=$enableval], [WIDEPROTO=auto])
+AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h])
+
# Handle Xpoll.h.in
fds_bits_found=false;
@@ -42,8 +44,18 @@ if test "x$fds_bits_found" = xfalse ; then
USE_FDS_BITS="fds_bits"
],,
[
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+ #ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
+ #endif
])
fi
@@ -54,8 +66,18 @@ if test "x$fds_bits_found" = xfalse ; then
USE_FDS_BITS="__fds_bits"
],,
[
- #include <sys/types.h>
- #include <sys/select.h>
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
])
fi
Reply to: