CVS commit: xsrc/external/mit/xkbcomp/dist

2015-07-22 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul 22 08:39:03 UTC 2015

Modified Files:
xsrc/external/mit/xkbcomp/dist: expr.c

Log Message:
adjust a nul-string assignment to avoid const issues.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xkbcomp/dist/expr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkbcomp/dist/expr.c
diff -u xsrc/external/mit/xkbcomp/dist/expr.c:1.1.1.3 xsrc/external/mit/xkbcomp/dist/expr.c:1.2
--- xsrc/external/mit/xkbcomp/dist/expr.c:1.1.1.3	Wed Jul 22 08:34:46 2015
+++ xsrc/external/mit/xkbcomp/dist/expr.c	Wed Jul 22 08:39:03 2015
@@ -729,7 +729,8 @@ ExprResolveString(ExprDef * expr,
 val_rtrn-str = XkbAtomGetString(NULL, expr-value.str);
 if (val_rtrn-str == NULL)
 {
-static const char *empty = ;
+	static char empty_char = '\0';
+char *empty = empty_char;
 val_rtrn-str = empty;
 }
 return True;

CVS commit: xsrc/external/mit/xkbcomp/dist

2011-07-23 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 23 07:27:32 UTC 2011

Update of /cvsroot/xsrc/external/mit/xkbcomp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5051

Log Message:
initial import of xkbcomp-1.2.3

Status:

Vendor Tag: xorg
Release Tags:   xkbcomp-1-2-3

U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/misc.c
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/expr.h
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/listing.c
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/ChangeLog
C xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/man/Makefile.am
U xsrc/external/mit/xkbcomp/dist/man/Makefile.in
U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xkbcomp/dist

CVS commit: xsrc/external/mit/xkbcomp/dist

2011-07-23 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 23 07:37:24 UTC 2011

Modified Files:
xsrc/external/mit/xkbcomp/dist: utils.h

Log Message:
merge xkbcomp 1.2.3


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkbcomp/dist/utils.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkbcomp/dist/utils.h
diff -u xsrc/external/mit/xkbcomp/dist/utils.h:1.2 xsrc/external/mit/xkbcomp/dist/utils.h:1.3
--- xsrc/external/mit/xkbcomp/dist/utils.h:1.2	Sat Aug 22 01:04:32 2009
+++ xsrc/external/mit/xkbcomp/dist/utils.h	Sat Jul 23 07:37:24 2011
@@ -117,12 +117,7 @@
 
 extern void
 uInformation(const char * /* s */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
 #define ACTION6			uAction
 #define ACTION5			uAction
@@ -133,12 +128,7 @@
 #define ACTION			uAction
 
  extern void uAction(const char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
 #define WARN6			uWarning
 #define WARN5			uWarning
@@ -149,12 +139,7 @@
 #define WARN			uWarning
 
  extern void uWarning(const char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
 #define ERROR6			uError
 #define ERROR5			uError
@@ -165,12 +150,7 @@
 #define ERROR			uError
 
  extern void uError(const char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
 #define FATAL6			uFatalError
 #define FATAL5			uFatalError
@@ -181,12 +161,7 @@
 #define FATAL			uFatalError
 
  extern void uFatalError(const char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
 /* WSGO stands for Weird Stuff Going On */
 #define WSGO6			uInternalError
@@ -198,12 +173,7 @@
 #define WSGO			uInternalError
 
  extern void uInternalError(const char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
  extern void uSetPreErrorMessage(char * /* msg */
 );
@@ -264,21 +234,11 @@
  unsigned int DEBUG_VAR;
 
  extern void uDebug(char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
  extern void uDebugNOI( /* no indent */
   char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 1, 2)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(1, 2);
 
  extern Boolean uSetDebugFile(char *name);
 
@@ -318,12 +278,7 @@
  extern Boolean uSetEntryFile(char *name);
  extern void uEntry(int /* l */ ,
 char * /* s  */ , ...
-)
-#if defined(__GNUC__)  \
-((__GNUC__  2) || ((__GNUC__ == 2)  (__GNUC_MINOR__ = 6)))
-__attribute__ ((format(printf, 2, 3)))
-#endif
-;
+) _X_ATTRIBUTE_PRINTF(2, 3);
 
  extern void uExit(int l, char *rtVal);
 #ifdef ENTRY_TRACKING_ON

CVS commit: xsrc/external/mit/xkbcomp/dist

2011-02-20 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Feb 21 04:52:57 UTC 2011

Update of /cvsroot/xsrc/external/mit/xkbcomp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv9335

Log Message:
initial import of xkbcomp-1.2.1

Status:

Vendor Tag: xorg
Release Tags:   xkbcomp-1-2-1

U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/ChangeLog
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/expr.h
U xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/misc.c
U xsrc/external/mit/xkbcomp/dist/listing.c
N xsrc/external/mit/xkbcomp/dist/man/Makefile.in
N xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man
N xsrc/external/mit/xkbcomp/dist/man/Makefile.am

No conflicts created by this import

CVS commit: xsrc/external/mit/xkbcomp/dist

2011-02-20 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Feb 21 04:54:17 UTC 2011

Removed Files:
xsrc/external/mit/xkbcomp/dist: README.config README.enhancing
xkbcomp.man

Log Message:
merge xkbcomp 1.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbcomp/dist/README.config \
xsrc/external/mit/xkbcomp/dist/README.enhancing \
xsrc/external/mit/xkbcomp/dist/xkbcomp.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xkbcomp/dist

2010-11-20 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 21 03:47:57 UTC 2010

Update of /cvsroot/xsrc/external/mit/xkbcomp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3195

Log Message:
initial import of xkbcomp-1.2.0

Status:

Vendor Tag: xorg
Release Tags:   xkbcomp-1-2-0

U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/README.enhancing
U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/ChangeLog
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/misc.c
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/listing.c
U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/xkbcomp.man
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/README.config
U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/expr.h

No conflicts created by this import