head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.20
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.18
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.16
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.14
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.12
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.10
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.8
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.6
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.4
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.2
	pkgsrc-2008Q1-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2008.03.02.14.44.47;	author bjs;	state dead;
branches;
next	1.1;

1.1
date	2008.01.29.02.00.22;	author bjs;	state Exp;
branches;
next	;


desc
@@


1.2
log
@
Update to version 1.0.4, which incorporates all of the patches
that were here previously.
@
text
@$NetBSD: patch-ae,v 1.1 2008/01/29 02:00:22 bjs Exp $

Fix warnings.

--- src/extutil.c.orig	2006-07-11 14:05:14.000000000 -0400
+++ src/extutil.c
@@@@ -248,11 +248,11 @@@@ static int _default_exterror (Display *d
  * requested extension is referenced.  This should eventually move into Xlib.
  */
 
-extern int (*_XExtensionErrorFunction)();
+extern int (*_XExtensionErrorFunction)(Display*, char *, char * );
 
-int (*XSetExtensionErrorHandler(int (*handler)(Display*, char *, char * )))()
+int (*XSetExtensionErrorHandler(int (*handler)(Display*, char *, char * )))(Display*, char *, char * )
 {
-    int (*oldhandler)() = _XExtensionErrorFunction;
+    int (*oldhandler)(Display*, char *, char * ) = _XExtensionErrorFunction;
 
     _XExtensionErrorFunction = (handler ? handler :
 				_default_exterror);
@@@@ -265,7 +265,7 @@@@ int (*XSetExtensionErrorHandler(int (*ha
  */
 int XMissingExtension (Display *dpy, _Xconst char *ext_name)
 {
-    int (*func)() = (_XExtensionErrorFunction ?
+    int (*func)(Display*, char *, char *) = (_XExtensionErrorFunction ?
 		     _XExtensionErrorFunction : _default_exterror);
 
     if (!ext_name) ext_name = X_EXTENSION_UNKNOWN;
@


1.1
log
@

Fixes from GIT:

- XeviGetVisualInfo: check for null pointer before writing to it, not after
- Coverity #467: security_error_list has fewer than XSecurityNumberErrors
  entries

- Fix misc. warnings.

Bump rev.
@
text
@d1 1
a1 1
$NetBSD$
@