Update to xproto-7.0.16. Changes:

Improves compatibility with some current OS'es, at the cost of
decreased compatibility with premillennial OS'es and pre-C89 compilers.

Death to RCS tags.
Remove all trace of X_NOT_STDC_ENV (#6527)
Remove a bunch of garbage for unsupported platforms.
__STDC__ is always defined in C89.
Use ## catenation not /**/
Remove #ifdef macII code left over from ancient A/UX 3.0 support
Removing dangling #else block from X_NOT_STDC_ENV removal
Use indentation to provide a map through the twisty maze of ifdefs, all alike
Drop support for SunOS 4 and Solaris releases older than 2.5 (1995)
Get rid of unneeded && clause in list of LP64 ifdefs in Xmd.h
Drop #ifdef USG checks for some truly ancient (pre-SVR4) SysV's
Don't need an #ifdef when both cases just include the same file
xproto 7.0.16
Apple: Only define _DARWIN_C_SOURCE if it isn't already defined
Cygwin/X: Don't destroy min/max macros in Xwindows.h
Restore macro definition of sleep(), needed by Xming

3 files changed, 21 insertions, 21 deletions

diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index d19a1bbe2ec..14bcc7e11e1 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/03/06 10:28:32 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/15 18:03:32 tnn Exp $
 #
 
-DISTNAME=		xproto-7.0.15
+DISTNAME=		xproto-7.0.16
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 6d0ef523b14..d50b53a6ec3 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2009/03/06 10:28:32 wiz Exp $
+$NetBSD: distinfo,v 1.15 2010/01/15 18:03:32 tnn Exp $
 
-SHA1 (xproto-7.0.15.tar.bz2) = 891e3f8e2c17128a8fc6930583e42fd3db75839a
-RMD160 (xproto-7.0.15.tar.bz2) = 6c722c6bf29e24706fb7a06aec2585c03e431134
-Size (xproto-7.0.15.tar.bz2) = 159189 bytes
-SHA1 (patch-aa) = 2be25c80a096ed895b92bbe60a30bc1c0db42081
+SHA1 (xproto-7.0.16.tar.bz2) = 0eda5588d42f2c810d8491da44fe84a4093e12bc
+RMD160 (xproto-7.0.16.tar.bz2) = 5360ddd52eb75a161e482a48ef53dbd41769ce08
+Size (xproto-7.0.16.tar.bz2) = 159876 bytes
+SHA1 (patch-aa) = 8060c40ed4280fce4a74fd55e17c014eb2c48e3b
 SHA1 (patch-ab) = d01eb0037aa03fff87e349b2cdb34e9753fd99a4
 SHA1 (patch-ac) = f883802e420f9e401511435b7daf915f3bf6d927
 SHA1 (patch-ad) = 636ad47ffd0d47e286737b24c768f597ea9da1ab
diff --git a/x11/xproto/patches/patch-aa b/x11/xproto/patches/patch-aa
index 1691b4c5c38..daae708375c 100644
--- a/x11/xproto/patches/patch-aa
+++ b/x11/xproto/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
+$NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
 
---- Xos_r.h.in.orig	2006-09-20 19:59:42.000000000 +0200
+--- Xos_r.h.in.orig	2009-09-23 23:51:43.000000000 +0000
 +++ Xos_r.h.in
-@@ -76,13 +76,7 @@ in this Software without prior written a
+@@ -73,13 +73,7 @@ in this Software without prior written a
  # include <X11/Xfuncs.h>
  
  # ifndef X_NOT_POSIX
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #  ifndef LINE_MAX
  #   define X_LINE_MAX 2048
  #  else
-@@ -188,6 +182,13 @@ extern void XtProcessUnlock(
+@@ -185,6 +179,13 @@ extern void XtProcessUnlock(
  #  endif
  # endif
  
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #endif /* !defined WIN32 */
  
  /*
-@@ -226,7 +227,7 @@ extern void XtProcessUnlock(
+@@ -214,7 +215,7 @@ extern void XtProcessUnlock(
  
  #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
  # include <pwd.h>
@@ -40,16 +40,16 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #  define XOS_USE_MTSAFE_PWDAPI 1
  # endif
  #endif
-@@ -330,7 +331,7 @@ static __inline__ void _Xpw_copyPasswd(_
+@@ -318,7 +319,7 @@ static __inline__ void _Xpw_copyPasswd(_
    (_Xos_processUnlock), \
    (p).pwp )
  
 -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__)
 +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- /* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */
  # define X_NEEDS_PWPARAMS
  typedef struct {
-@@ -410,7 +411,7 @@ typedef int _Xgetpwret;
+   struct passwd pws;
+@@ -384,7 +385,7 @@ typedef int _Xgetpwret;
  #if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H) \
      && !defined(WIN32)
  # include <netdb.h>
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #  define XOS_USE_MTSAFE_NETDBAPI 1
  # endif
  #endif
-@@ -573,7 +574,7 @@ typedef int _Xgetservbynameparams; /* du
+@@ -543,7 +544,7 @@ typedef int _Xgetservbynameparams; /* du
  #   define dirent direct
  #  endif
  # endif
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #  define XOS_USE_MTSAFE_DIRENTAPI 1
  # endif
  #endif
-@@ -656,15 +657,8 @@ extern int _Preaddir_r(DIR *, struct dir
+@@ -604,15 +605,8 @@ typedef struct {
  /* Pre-POSIX API, returns non-NULL on success. */
  #  define _XReaddir(d,p)	(readdir_r((d), &(p).dir_entry))
  # else
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  # endif
  #endif /* X_INCLUDE_DIRENT_H */
  
-@@ -691,7 +685,7 @@ extern int _Preaddir_r(DIR *, struct dir
+@@ -639,7 +633,7 @@ typedef struct {
  
  #if defined(X_INCLUDE_UNISTD_H) && !defined(_XOS_INCLUDED_UNISTD_H)
  /* <unistd.h> already included by <X11/Xos.h> */
@@ -94,7 +94,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #  define XOS_USE_MTSAFE_UNISTDAPI 1
  # endif
  #endif
-@@ -831,7 +825,7 @@ typedef struct {
+@@ -779,7 +773,7 @@ typedef struct {
  
  #if defined(X_INCLUDE_STRING_H) && !defined(_XOS_INCLUDED_STRING_H)
  /* <string.h> has already been included by <X11/Xos.h> */
@@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #  define XOS_USE_MTSAFE_STRINGAPI 1
  # endif
  #endif
-@@ -883,7 +877,7 @@ typedef char * _Xstrtokparams;
+@@ -831,7 +825,7 @@ typedef char * _Xstrtokparams;
  
  #if defined(X_INCLUDE_TIME_H) && !defined(_XOS_INCLUDED_TIME_H)
  # include <time.h>
@@ -112,7 +112,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/01 21:56:16 hasso Exp $
  #  define XOS_USE_MTSAFE_TIMEAPI 1
  # endif
  #endif
-@@ -1046,7 +1040,7 @@ typedef struct tm _Xltimeparams;
+@@ -987,7 +981,7 @@ typedef struct tm _Xltimeparams;
  
  #if defined(X_INCLUDE_GRP_H) && !defined(_XOS_INCLUDED_GRP_H)
  # include <grp.h>