summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-02-26 09:23:54 +0000
committerEgbert Eich <eich@suse.de>2004-02-26 09:23:54 +0000
commitc254e7bc20ccc7fc9ac436e3f6a710f9bd76b7de (patch)
tree54bdb9f253408cfd052f0551e84bc68c291458fb
parent9aa9842a364e2e085cceb1746b1255a199de277d (diff)
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
-rw-r--r--di/atomcache.c2
-rw-r--r--di/cache.c2
-rw-r--r--di/cmap.c2
-rw-r--r--di/cmaputil.c2
-rw-r--r--di/dispatch.c2
-rw-r--r--di/gfx.c2
-rw-r--r--di/init.c2
-rw-r--r--di/lbxfuncs.c2
-rw-r--r--di/lbxutil.c2
-rw-r--r--di/main.c2
-rw-r--r--di/options.c2
-rw-r--r--di/pm.c2
-rw-r--r--di/props.c2
-rw-r--r--di/utils.c2
-rw-r--r--di/wire.c2
-rw-r--r--include/atomcache.h2
-rw-r--r--include/cache.h2
-rw-r--r--include/colormap.h2
-rw-r--r--include/init.h2
-rw-r--r--include/lbx.h2
-rw-r--r--include/lbxext.h2
-rw-r--r--include/misc.h2
-rw-r--r--include/os.h2
-rw-r--r--include/pm.h2
-rw-r--r--include/proxyopts.h2
-rw-r--r--include/reqtype.h2
-rw-r--r--include/resource.h2
-rw-r--r--include/swap.h2
-rw-r--r--include/tags.h2
-rw-r--r--include/util.h2
-rw-r--r--include/wire.h2
-rw-r--r--lbxproxy.man2
-rw-r--r--os/WaitFor.c2
-rw-r--r--os/connection.c2
-rw-r--r--os/io.c2
-rw-r--r--os/osdep.h2
36 files changed, 36 insertions, 36 deletions
diff --git a/di/atomcache.c b/di/atomcache.c
index 43e2466..8cf6834 100644
--- a/di/atomcache.c
+++ b/di/atomcache.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/atomcache.c,v 1.7 2002/10/15 02:16:26 dawes Exp $ */
+/* $XFree86$ */
/*
* atom cache for LBX
diff --git a/di/cache.c b/di/cache.c
index 124cf31..8fa79d3 100644
--- a/di/cache.c
+++ b/di/cache.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/cache.c,v 1.7 2003/10/24 20:38:12 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "util.h"
#include "cache.h"
diff --git a/di/cmap.c b/di/cmap.c
index c111805..ddcc924 100644
--- a/di/cmap.c
+++ b/di/cmap.c
@@ -48,7 +48,7 @@ from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/cmap.c,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "assert.h"
diff --git a/di/cmaputil.c b/di/cmaputil.c
index efccc2f..97c95d3 100644
--- a/di/cmaputil.c
+++ b/di/cmaputil.c
@@ -48,7 +48,7 @@ from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/cmaputil.c,v 1.12 2003/10/24 20:38:12 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "misc.h"
diff --git a/di/dispatch.c b/di/dispatch.c
index 04de628..ad8c817 100644
--- a/di/dispatch.c
+++ b/di/dispatch.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/dispatch.c,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "assert.h"
diff --git a/di/gfx.c b/di/gfx.c
index a3a6794..18dc256 100644
--- a/di/gfx.c
+++ b/di/gfx.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/gfx.c,v 1.6 2001/12/14 20:00:51 dawes Exp $ */
+/* $XFree86$ */
/*
* graphics acceleration
diff --git a/di/init.c b/di/init.c
index fb4879a..f154373 100644
--- a/di/init.c
+++ b/di/init.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/init.c,v 1.6 2001/12/14 20:00:51 dawes Exp $ */
+/* $XFree86$ */
/*
* This file is used for anything that needs to dip into Xlib structures
diff --git a/di/lbxfuncs.c b/di/lbxfuncs.c
index d756e24..16c6210 100644
--- a/di/lbxfuncs.c
+++ b/di/lbxfuncs.c
@@ -22,7 +22,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/lbxfuncs.c,v 1.7 2003/05/27 22:26:56 tsi Exp $ */
+/* $XFree86$ */
/*
* top level LBX request & reply handling
diff --git a/di/lbxutil.c b/di/lbxutil.c
index 9bd16c1..a24ac27 100644
--- a/di/lbxutil.c
+++ b/di/lbxutil.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/lbxutil.c,v 1.5 2001/10/28 03:34:22 tsi Exp $ */
+/* $XFree86$ */
/*
* utility routines for LBX requests
diff --git a/di/main.c b/di/main.c
index bdfdac5..3fbec4a 100644
--- a/di/main.c
+++ b/di/main.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/main.c,v 1.9 2001/12/14 20:00:51 dawes Exp $ */
+/* $XFree86$ */
#include <stdlib.h>
#include "lbx.h"
diff --git a/di/options.c b/di/options.c
index 359e305..f2c0e8b 100644
--- a/di/options.c
+++ b/di/options.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.9 2003/12/19 02:05:39 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "X.h"
diff --git a/di/pm.c b/di/pm.c
index 736c678..afd5eda 100644
--- a/di/pm.c
+++ b/di/pm.c
@@ -24,7 +24,7 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/lbxproxy/di/pm.c,v 1.15 2004/01/07 04:28:06 dawes Exp $ */
+/* $XFree86$ */
#include <ctype.h>
#include <stdio.h>
diff --git a/di/props.c b/di/props.c
index 8f2c7b3..66cffb6 100644
--- a/di/props.c
+++ b/di/props.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/props.c,v 1.7 2003/10/24 20:38:12 tsi Exp $ */
+/* $XFree86$ */
/*
* property handling
diff --git a/di/utils.c b/di/utils.c
index 9201528..96503eb 100644
--- a/di/utils.c
+++ b/di/utils.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/lbxproxy/di/utils.c,v 1.18 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#include "lbx.h"
#include <stdio.h>
diff --git a/di/wire.c b/di/wire.c
index b06e84c..631af05 100644
--- a/di/wire.c
+++ b/di/wire.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.15 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#include "lbx.h"
#include <stdio.h>
diff --git a/include/atomcache.h b/include/atomcache.h
index cf65008..b70f792 100644
--- a/include/atomcache.h
+++ b/include/atomcache.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/atomcache.h,v 1.6 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef _ATOMCACHE_H_
#define _ATOMCACHE_H_
diff --git a/include/cache.h b/include/cache.h
index 66fd0e5..c8ffdff 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -50,7 +50,7 @@ from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/cache.h,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef _CACHE_H_
#define _CACHE_H_
diff --git a/include/colormap.h b/include/colormap.h
index 561e5fa..2346662 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/colormap.h,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef COLORMAP_H_
#define COLORMAP_H_
diff --git a/include/init.h b/include/init.h
index dc73d40..2ac786e 100644
--- a/include/init.h
+++ b/include/init.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/init.h,v 1.3 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef _INIT_H_
#define _INIT_H_
diff --git a/include/lbx.h b/include/lbx.h
index 8993166..27c921f 100644
--- a/include/lbx.h
+++ b/include/lbx.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef _LBX_H_
#define _LBX_H_
diff --git a/include/lbxext.h b/include/lbxext.h
index 2ce3485..637ec04 100644
--- a/include/lbxext.h
+++ b/include/lbxext.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/lbxext.h,v 1.3 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef _LBXEXT_H_
#define _LBXEXT_H_
diff --git a/include/misc.h b/include/misc.h
index 526372a..4412576 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/lbxproxy/include/misc.h,v 1.7 2001/12/14 20:00:55 dawes Exp $ */
+/* $XFree86$ */
#ifndef MISC_H
#define MISC_H 1
diff --git a/include/os.h b/include/os.h
index 2dca444..a7668f8 100644
--- a/include/os.h
+++ b/include/os.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/lbxproxy/include/os.h,v 1.8 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef OS_H
#define OS_H
diff --git a/include/pm.h b/include/pm.h
index efd3dd8..95e71bd 100644
--- a/include/pm.h
+++ b/include/pm.h
@@ -25,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/lbxproxy/include/pm.h,v 1.5 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#include <X11/ICE/ICElib.h>
diff --git a/include/proxyopts.h b/include/proxyopts.h
index 6abce40..ac676c4 100644
--- a/include/proxyopts.h
+++ b/include/proxyopts.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/proxyopts.h,v 1.6 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
#ifndef _LBX_PROXYOPTS_H_
#define _LBX_PROXYOPTS_H_
diff --git a/include/reqtype.h b/include/reqtype.h
index 67e378c..2968824 100644
--- a/include/reqtype.h
+++ b/include/reqtype.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/reqtype.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
#ifndef _REQTYPE_H_
#define _REQTYPE_H_
diff --git a/include/resource.h b/include/resource.h
index 164f867..a3662ec 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/lbxproxy/include/resource.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
#ifndef RESOURCE_H
#define RESOURCE_H 1
diff --git a/include/swap.h b/include/swap.h
index 9d50be1..edfa728 100644
--- a/include/swap.h
+++ b/include/swap.h
@@ -22,7 +22,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/swap.h,v 1.3 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
#ifndef _SWAP_H_
#define _SWAP_H_
diff --git a/include/tags.h b/include/tags.h
index 94b9975..866a5b8 100644
--- a/include/tags.h
+++ b/include/tags.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/tags.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
#ifndef _TAGS_H_
#define _TAGS_H_
diff --git a/include/util.h b/include/util.h
index 0e1683f..92cf4a9 100644
--- a/include/util.h
+++ b/include/util.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/util.h,v 1.8 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
#ifndef _UTIL_H_
#define _UTIL_H_
diff --git a/include/wire.h b/include/wire.h
index f301f91..90af8c4 100644
--- a/include/wire.h
+++ b/include/wire.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/lbxproxy/include/wire.h,v 1.8 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
#ifdef DEBUG /* Need this here because lbx.h undef's DEBUG */
extern int lbxDebug;
diff --git a/lbxproxy.man b/lbxproxy.man
index 6419c57..a5e5fdc 100644
--- a/lbxproxy.man
+++ b/lbxproxy.man
@@ -24,7 +24,7 @@
.\" from The Open Group.
.\"
.\"
-.\" $XFree86: xc/programs/lbxproxy/lbxproxy.man,v 1.9 2003/05/29 21:48:10 herrb Exp $
+.\" $XFree86$
.\"
.TH LBXPROXY 1 __xorgversion__
.SH NAME
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 3bccd66..1640ef4 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/lbxproxy/os/WaitFor.c,v 1.9 2001/12/14 20:00:57 dawes Exp $ */
+/* $XFree86$ */
/*****************************************************************
* OS Dependent input routines:
diff --git a/os/connection.c b/os/connection.c
index 89b9758..87c12cc 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -60,7 +60,7 @@ SOFTWARE.
* socket ids aren't small nums (0 - 2^8)
*
*****************************************************************/
-/* $XFree86: xc/programs/lbxproxy/os/connection.c,v 1.19 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include <X11/Xtrans.h>
diff --git a/os/io.c b/os/io.c
index 7dbfd39..510994c 100644
--- a/os/io.c
+++ b/os/io.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/lbxproxy/os/io.c,v 1.11 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
/*****************************************************************
* i/o functions
*
diff --git a/os/osdep.h b/os/osdep.h
index 8daa5b5..0a19aa7 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/lbxproxy/os/osdep.h,v 1.11 2002/05/31 18:46:08 dawes Exp $ */
+/* $XFree86$ */
#define BOTIMEOUT 200 /* in milliseconds */
#define BUFSIZE 4096