From 53f74b6aa95fe57fda45fd8a051595e772f00402 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 16 Jun 2006 10:14:30 -0700 Subject: Bugzilla #5120, #7246: In CW's GC ops, validate the backing GC against the backing drawable if the serial numbers differ. Fixes crash in XAA which occurred when the DDX bumped the serial number on the backing drawable and expected it to get re-validated, and we didn't because the wrapped drawable hadn't been bumped. --- miext/cw/cw_ops.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'miext') diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c index 6ba804bb3..80b72806c 100644 --- a/miext/cw/cw_ops.c +++ b/miext/cw/cw_ops.c @@ -28,6 +28,7 @@ #include #include "gcstruct.h" +#include "pixmapstr.h" #include "cw.h" #define SETUP_BACKING_DST(_pDst, _pGC) \ @@ -43,6 +44,9 @@ &src_off_y) #define PROLOGUE(pGC) do { \ + if (pBackingGC->serialNumber != pBackingDst->serialNumber) { \ + ValidateGC(pBackingDst, pBackingGC); \ + } \ pGC->funcs = pGCPrivate->wrapFuncs;\ pGC->ops = pGCPrivate->wrapOps;\ } while (0) -- cgit v1.2.3 From 84683f19b4d1c712281036bcabf8dc623e64b26a Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 18 Jul 2006 18:16:12 -0400 Subject: get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE Get rid of almost all uses of these definitions. They're still defined for delinquent out-of-tree drivers, and also for the Mesa build. As well as for miinitext.c. But largely gone. --- GL/glx/Makefile.am | 4 +-- GL/mesa/X/Makefile.am | 4 +-- GL/mesa/array_cache/Makefile.am | 4 +-- GL/mesa/glapi/Makefile.am | 4 +-- GL/mesa/main/Makefile.am | 4 +-- GL/mesa/math/Makefile.am | 4 +-- GL/mesa/shader/Makefile.am | 4 +-- GL/mesa/shader/grammar/Makefile.am | 4 +-- GL/mesa/shader/slang/Makefile.am | 4 +-- GL/mesa/swrast/Makefile.am | 4 +-- GL/mesa/swrast_setup/Makefile.am | 4 +-- GL/mesa/tnl/Makefile.am | 4 +-- XTrap/Makefile.am | 2 +- Xext/Makefile.am | 2 +- Xi/Makefile.am | 2 +- afb/Makefile.am | 2 +- cfb/Makefile.am | 2 +- cfb32/Makefile.am | 2 +- composite/Makefile.am | 2 +- configure.ac | 15 +-------- damageext/Makefile.am | 2 +- dbe/Makefile.am | 2 +- dix/Makefile.am | 2 +- dix/atom.c | 2 ++ dix/colormap.c | 3 ++ dix/events.c | 6 ---- exa/Makefile.am | 2 +- fb/Makefile.am | 2 +- fb/fb24_32.c | 3 -- hw/darwin/quartz/xpr/dri.c | 5 --- hw/dmx/Makefile.am | 2 +- hw/dmx/config/Makefile.am | 2 +- hw/dmx/dmx-config.h | 1 - hw/dmx/glxProxy/Makefile.am | 4 +-- hw/dmx/glxProxy/glxscreens.c | 5 --- hw/dmx/input/Makefile.am | 2 +- hw/vfb/Makefile.am | 2 +- hw/xfree86/Makefile.am | 2 +- hw/xfree86/common/Makefile.am | 2 +- hw/xfree86/common/compiler.h | 16 ++++------ hw/xfree86/common/xf86.h | 2 -- hw/xfree86/common/xf86Config.c | 36 --------------------- hw/xfree86/common/xf86Configure.c | 10 ------ hw/xfree86/common/xf86DGA.c | 4 --- hw/xfree86/common/xf86DoProbe.c | 4 --- hw/xfree86/common/xf86DoScanPci.c | 9 ------ hw/xfree86/common/xf86Globals.c | 2 -- hw/xfree86/common/xf86Helper.c | 46 +-------------------------- hw/xfree86/common/xf86InPriv.h | 4 --- hw/xfree86/common/xf86Init.c | 24 -------------- hw/xfree86/common/xf86MiscExt.c | 6 ---- hw/xfree86/common/xf86Priv.h | 4 --- hw/xfree86/common/xf86pciBus.c | 7 ----- hw/xfree86/common/xf86str.h | 2 -- hw/xfree86/common/xf86xv.c | 9 ------ hw/xfree86/common/xf86xvmc.c | 6 ---- hw/xfree86/ddc/Makefile.am | 2 +- hw/xfree86/ddc/xf86DDC.c | 2 -- hw/xfree86/dixmods/Makefile.am | 4 ++- hw/xfree86/dixmods/extmod/Makefile.am | 2 +- hw/xfree86/doc/sgml/DESIGN.sgml | 7 +---- hw/xfree86/dri/Makefile.am | 6 ++-- hw/xfree86/dri/dri.c | 8 +---- hw/xfree86/dummylib/Makefile.am | 2 +- hw/xfree86/exa/Makefile.am | 2 +- hw/xfree86/fbdevhw/Makefile.am | 2 +- hw/xfree86/i2c/Makefile.am | 2 +- hw/xfree86/i2c/bt829.h | 18 ----------- hw/xfree86/i2c/fi1236.h | 13 -------- hw/xfree86/i2c/i2c_def.h | 15 --------- hw/xfree86/i2c/msp3430.h | 12 ------- hw/xfree86/i2c/tda8425.h | 11 ------- hw/xfree86/i2c/tda9850.h | 13 -------- hw/xfree86/i2c/tda9885.h | 12 ------- hw/xfree86/i2c/uda1380.h | 15 --------- hw/xfree86/int10/Makefile.am | 2 +- hw/xfree86/loader/Makefile.am | 2 +- hw/xfree86/os-support/bsd/Makefile.am | 2 +- hw/xfree86/os-support/bsd/bsd_jstk.c | 4 --- hw/xfree86/os-support/bus/Makefile.am | 2 +- hw/xfree86/os-support/drm/Makefile.am | 5 ++- hw/xfree86/os-support/drm/xf86drm.c | 48 +++++----------------------- hw/xfree86/os-support/drm/xf86drmHash.c | 4 +-- hw/xfree86/os-support/drm/xf86drmRandom.c | 4 +-- hw/xfree86/os-support/drm/xf86drmSL.c | 7 +---- hw/xfree86/os-support/linux/Makefile.am | 2 +- hw/xfree86/os-support/linux/int10/linux.c | 6 ---- hw/xfree86/os-support/linux/lnx_jstk.c | 4 --- hw/xfree86/os-support/misc/Makefile.am | 2 +- hw/xfree86/os-support/shared/sigio.c | 26 ---------------- hw/xfree86/os-support/shared/sigiostubs.c | 10 ------ hw/xfree86/os-support/solaris/Makefile.am | 2 +- hw/xfree86/os-support/xf86_OSproc.h | 2 -- hw/xfree86/os-support/xf86_ansic.h | 52 +++++++++---------------------- hw/xfree86/os-support/xf86_libc.h | 11 ++----- hw/xfree86/rac/Makefile.am | 2 +- hw/xfree86/ramdac/Makefile.am | 2 +- hw/xfree86/scanpci/Makefile.am | 2 +- hw/xfree86/shadowfb/Makefile.am | 2 +- hw/xfree86/utils/xorgcfg/Makefile.am | 2 +- hw/xfree86/utils/xorgcfg/loader.h | 3 -- hw/xfree86/utils/xorgconfig/Makefile.am | 2 +- hw/xfree86/vbe/Makefile.am | 2 +- hw/xfree86/vgahw/Makefile.am | 2 +- hw/xfree86/xaa/Makefile.am | 2 +- hw/xfree86/xf1bpp/Makefile.am | 3 +- hw/xfree86/xf4bpp/Makefile.am | 2 +- hw/xfree86/xf8_16bpp/Makefile.am | 2 +- hw/xfree86/xf8_32bpp/Makefile.am | 2 +- hw/xgl/Makefile.am | 2 +- hw/xgl/egl/Makefile.am | 2 +- hw/xgl/glx/Makefile.am | 2 +- hw/xgl/glxext/Makefile.am | 2 +- hw/xgl/glxext/module/Makefile.am | 2 +- hw/xnest/Makefile.am | 2 +- hw/xnest/xnest-config.h | 1 - hw/xprint/Makefile.am | 2 +- hw/xprint/ps/Makefile.am | 2 +- hw/xprint/raster/Makefile.am | 2 +- include/misc.h | 14 ++------- include/os.h | 12 +------ include/xorg-server.h.in | 3 ++ mfb/Makefile.am | 2 +- mfb/maskbits.h | 2 +- mi/Makefile.am | 2 +- mi/mibitblt.c | 2 +- mi/mipushpxl.c | 10 +++--- mi/miwideline.c | 2 +- miext/cw/Makefile.am | 2 +- miext/damage/Makefile.am | 2 +- miext/damage/damage.c | 2 -- miext/shadow/Makefile.am | 2 +- os/Makefile.am | 2 +- os/utils.c | 10 ++---- randr/Makefile.am | 2 +- record/Makefile.am | 2 +- render/Makefile.am | 2 +- xfixes/Makefile.am | 2 +- xkb/Makefile.am | 2 +- xkb/xkbActions.c | 4 --- xorg-server.pc.in | 2 +- 141 files changed, 146 insertions(+), 652 deletions(-) (limited to 'miext') diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am index 646f7d102..1d4a9865d 100644 --- a/GL/glx/Makefile.am +++ b/GL/glx/Makefile.am @@ -13,9 +13,7 @@ AM_CFLAGS = \ @DRIPROTO_CFLAGS@ \ -I@MESA_SOURCE@/src/mesa/glapi \ -I@MESA_SOURCE@/src/mesa/main \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ -DNO_LIBCWRAPPER \ @GLX_DEFINES@ diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index 1f740ee90..2a9f4225a 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -20,9 +20,7 @@ INCLUDES = -I@MESA_SOURCE@/include \ # symbol means "being built in the server" AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ \ -DXFree86Server diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am index 4169f3df3..5016b73b0 100644 --- a/GL/mesa/array_cache/Makefile.am +++ b/GL/mesa/array_cache/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libac.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am index 223f0c213..de457b988 100644 --- a/GL/mesa/glapi/Makefile.am +++ b/GL/mesa/glapi/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libglapi.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index 2db76b604..4d5b0cd4a 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmain.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am index 4b157c394..5e99d90c4 100644 --- a/GL/mesa/math/Makefile.am +++ b/GL/mesa/math/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmath.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index dd0ed712f..4bd57363f 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -4,9 +4,7 @@ noinst_LTLIBRARIES = libshader.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am index 9f9e5f61e..0974d5b95 100644 --- a/GL/mesa/shader/grammar/Makefile.am +++ b/GL/mesa/shader/grammar/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libgrammar.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index 7088ee15c..8f2636ea4 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libslang.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index 904b772dc..d972af6eb 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libswrast.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am index c52575d1e..8d7040880 100644 --- a/GL/mesa/swrast_setup/Makefile.am +++ b/GL/mesa/swrast_setup/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libss.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index cbf46fda3..717e6fd53 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libtnl.la AM_CFLAGS = \ $(DIX_CFLAGS) \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + -DXFree86Server \ @GLX_DEFINES@ INCLUDES = -I@MESA_SOURCE@/include \ diff --git a/XTrap/Makefile.am b/XTrap/Makefile.am index cdbfe111c..1eddd4f56 100644 --- a/XTrap/Makefile.am +++ b/XTrap/Makefile.am @@ -1,5 +1,5 @@ noinst_LTLIBRARIES = libxtrap.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 56c50538b..fde0550ee 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -12,7 +12,7 @@ endif INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) if XORG sdk_HEADERS = xvdix.h xvmcext.h diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 8eac59bb6..fbe438543 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libXi.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) libXi_la_SOURCES = \ allowev.c \ diff --git a/afb/Makefile.am b/afb/Makefile.am index e7dedfabc..d83b67417 100644 --- a/afb/Makefile.am +++ b/afb/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libafb.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c diff --git a/cfb/Makefile.am b/cfb/Makefile.am index 89832fa7b..d24f027e7 100644 --- a/cfb/Makefile.am +++ b/cfb/Makefile.am @@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \ libcfb_la_LIBADD = ../mfb/libmfb.la -AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common diff --git a/cfb32/Makefile.am b/cfb32/Makefile.am index a549d1839..681a09575 100644 --- a/cfb32/Makefile.am +++ b/cfb32/Makefile.am @@ -6,4 +6,4 @@ libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common -AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) diff --git a/composite/Makefile.am b/composite/Makefile.am index dbcb8c61f..21504e659 100644 --- a/composite/Makefile.am +++ b/composite/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libcomposite.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) libcomposite_la_SOURCES = \ compalloc.c \ diff --git a/configure.ac b/configure.ac index 56bee7900..51b634eb7 100644 --- a/configure.ac +++ b/configure.ac @@ -865,11 +865,6 @@ dnl --------------------------------------------------------------------------- dnl DDX section. dnl --------------------------------------------------------------------------- -dnl These are used to define Xorg module, loader and general server defines -MODULE_DEFINES="" -LOADER_DEFINES="" -SERVER_DEFINES="" - dnl DMX DDX AC_MSG_CHECKING([whether to build Xdmx DDX]) @@ -1244,11 +1239,6 @@ int main () { AC_SUBST([XORG_CFLAGS]) AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) - dnl Module defines are used in the Xorg server and the drivers - MODULE_DEFINES="$MODULE_DEFINES -DIN_MODULE -DXFree86Module" - LOADER_DEFINES="$LOADER_DEFINES -DXFree86LOADER" - SERVER_DEFINES="$SERVER_DEFINES -DXFree86Server" - dnl these only go in xorg-config.h XF86CONFIGFILE="xorg.conf" CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" @@ -1256,6 +1246,7 @@ int main () { AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) + AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) @@ -1593,10 +1584,6 @@ AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes]) AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd]) AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) -AC_SUBST([MODULE_DEFINES]) -AC_SUBST([LOADER_DEFINES]) -AC_SUBST([SERVER_DEFINES]) - CFLAGS="$XSERVER_CFLAGS $CFLAGS" AC_SUBST([CFLAGS]) diff --git a/damageext/Makefile.am b/damageext/Makefile.am index 171cd270c..35f7620fb 100644 --- a/damageext/Makefile.am +++ b/damageext/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdamageext.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) libdamageext_la_SOURCES = \ damageext.c \ diff --git a/dbe/Makefile.am b/dbe/Makefile.am index 01de4707a..043555b8c 100644 --- a/dbe/Makefile.am +++ b/dbe/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdbe.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) if XORG sdk_HEADERS = dbestruct.h diff --git a/dix/Makefile.am b/dix/Makefile.am index 414f1258c..d26d9ea7a 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdix.la libxpstubs.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \ +AM_CFLAGS = $(DIX_CFLAGS) \ -DVENDOR_STRING=\""@VENDOR_STRING@"\" \ -DVENDOR_RELEASE="@VENDOR_RELEASE@" diff --git a/dix/atom.c b/dix/atom.c index 53cd5c311..e6577fdd6 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -54,6 +54,8 @@ SOFTWARE. #include #include +#include +#include #include "misc.h" #include "resource.h" #include "dix.h" diff --git a/dix/colormap.c b/dix/colormap.c index ba52c251c..b8d8586b0 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -56,6 +56,9 @@ SOFTWARE. #include #define NEED_EVENTS #include +#include +#include +#include #include "misc.h" #include "dix.h" #include "colormapst.h" diff --git a/dix/events.c b/dix/events.c index c67cf8ce4..479b4d80c 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3019,9 +3019,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count butc->buttonsDown++; butc->motionMask = ButtonMotionMask; *kptr |= bit; -#if !defined(XFree86Server) || !defined(XINPUT) - xE->u.u.detail = butc->map[key]; -#endif if (xE->u.u.detail == 0) return; if (xE->u.u.detail <= 5) @@ -3038,9 +3035,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count if (!butc->buttonsDown) butc->motionMask = 0; *kptr &= ~bit; -#if !defined(XFree86Server) || !defined(XINPUT) - xE->u.u.detail = butc->map[key]; -#endif if (xE->u.u.detail == 0) return; if (xE->u.u.detail <= 5) diff --git a/exa/Makefile.am b/exa/Makefile.am index 98db0271f..e2f7ed302 100644 --- a/exa/Makefile.am +++ b/exa/Makefile.am @@ -12,7 +12,7 @@ INCLUDES = \ $(XORG_INCS) \ -I$(srcdir)/../miext/cw -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ $(DIX_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) libexa_la_SOURCES = \ exa.c \ diff --git a/fb/Makefile.am b/fb/Makefile.am index 7b024aa75..11b2d2fea 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ -I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/hw/xfree86/common -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) if XORG sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h diff --git a/fb/fb24_32.c b/fb/fb24_32.c index d18ef70ce..92b8e1b22 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -28,9 +28,6 @@ #endif #include -#ifdef XFree86LOADER -#include "xf86.h" -#endif #include "fb.h" diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index e8e49f965..c878e7d47 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -35,13 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -#ifdef XFree86LOADER -#include "xf86.h" -#include "xf86_ansic.h" -#else #include #include -#endif #define NEED_REPLIES #define NEED_EVENTS diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 93abd7a0e..81b62f1fe 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -81,7 +81,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \ config/libdmxconfig.a \ @DMXMODULES_LIBS@ -Xdmx_CFLAGS = @SERVER_DEFINES@ \ +Xdmx_CFLAGS = \ -DHAVE_DMX_CONFIG_H \ $(GLX_INCS) \ $(GLX_DEFS) \ diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index 7376ec23a..fbc7f35a1 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -27,7 +27,7 @@ endif AM_YFLAGS = -d AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -I$(top_srcdir)/hw/dmx \ $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h index 11e8fb8e5..9647448dc 100644 --- a/hw/dmx/dmx-config.h +++ b/hw/dmx/dmx-config.h @@ -93,6 +93,5 @@ #undef DAMAGE #undef COMPOSITE #undef FONTCACHE -#undef XFree86LOADER #endif /* DMX_CONFIG_H */ diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index a798647cc..2f4a3b708 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -31,8 +31,8 @@ libglxproxy_a_SOURCES = compsize.c \ renderpixswap.c \ unpack.h -AM_CFLAGS = @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ +AM_CFLAGS = \ + \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/include \ -I$(top_srcdir)/GL/include \ diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c index a7d4ce13d..2f6359553 100644 --- a/hw/dmx/glxProxy/glxscreens.c +++ b/hw/dmx/glxProxy/glxscreens.c @@ -48,12 +48,7 @@ #include "glxserver.h" -#ifdef IN_MODULE #include -#else -#include -#include -#endif #include diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index d37c2a9ce..326506e77 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -60,7 +60,7 @@ GLX_DEFS = @GL_CFLAGS@ GLX_INCS = -I@MESA_SOURCE@/include endif -AM_CFLAGS = @SERVER_DEFINES@ \ +AM_CFLAGS = \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/xfree86/common \ $(GLX_INCS) \ diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index bd87d1d4b..baab5ca22 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -21,7 +21,7 @@ Xvfb_LDFLAGS = AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ -DNO_HW_ONLY_EXTS \ -DNO_MODULE_EXTS \ - @SERVER_DEFINES@ \ + \ $(XVFBMODULES_CFLAGS) # Man page diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index b50b6ab07..3a5ef65ac 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -16,7 +16,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ bin_PROGRAMS = Xorg -AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 0fe8aff27..84818ff41 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -103,4 +103,4 @@ if LNXACPI XORG_CFLAGS += -DHAVE_ACPI endif -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 001bbf2b3..754ad7c77 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1605,17 +1605,13 @@ extern void outl(unsigned int a, unsigned int l); # endif # ifndef SCO325 # if defined(__UNIXWARE__) -# if defined(IN_MODULE) # /* avoid including for on UnixWare */ -# define ushort unsigned short -# define ushort_t unsigned short -# define ulong unsigned long -# define ulong_t unsigned long -# define uint_t unsigned int -# define uchar_t unsigned char -# else -# include -# endif /* IN_MODULE */ +# define ushort unsigned short +# define ushort_t unsigned short +# define ulong unsigned long +# define ulong_t unsigned long +# define uint_t unsigned int +# define uchar_t unsigned char # endif /* __UNIXWARE__ */ # if !defined(sgi) && !defined(__SUNPRO_C) # include diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 3c416a0be..87ae55143 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -354,10 +354,8 @@ int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, pointer value); Bool xf86IsUnblank(int mode); -#ifdef XFree86LOADER void xf86AddModuleInfo(ModuleInfoPtr info, pointer module); void xf86DeleteModuleInfo(int idx); -#endif /* xf86Debug.c */ #ifdef BUILDDEBUG diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index bcad246f5..b932908d7 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -513,7 +513,6 @@ fixup_video_driver_list(char **drivers) static char ** GenerateDriverlist(char * dirname, char * drivernames) { -#ifdef XFree86LOADER char **ret; const char *subdirs[] = { dirname, NULL }; static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL}; @@ -524,39 +523,6 @@ GenerateDriverlist(char * dirname, char * drivernames) fixup_video_driver_list(ret); return ret; -#else /* non-loadable server */ - char *cp, **driverlist; - int count; - - /* Count the number needed */ - count = 0; - cp = drivernames; - while (*cp) { - while (*cp && isspace(*cp)) cp++; - if (!*cp) break; - count++; - while (*cp && !isspace(*cp)) cp++; - } - - if (!count) - return NULL; - - /* Now allocate the array of pointers to 0-terminated driver names */ - driverlist = (char **)xnfalloc((count + 1) * sizeof(char *)); - count = 0; - cp = drivernames; - while (*cp) { - while (*cp && isspace(*cp)) cp++; - if (!*cp) break; - driverlist[count++] = cp; - while (*cp && !isspace(*cp)) cp++; - if (!*cp) break; - *cp++ = 0; - } - driverlist[count] = NULL; - - return driverlist; -#endif } @@ -732,7 +698,6 @@ configFiles(XF86ConfFilesPtr fileconf) } -#ifdef XFree86LOADER /* ModulePath */ if (fileconf) { @@ -743,7 +708,6 @@ configFiles(XF86ConfFilesPtr fileconf) } xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath); -#endif #if 0 /* LogFile */ diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 4b9d418b9..a0d622a33 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -37,9 +37,7 @@ #include #include #include "os.h" -#ifdef XFree86LOADER #include "loaderProcs.h" -#endif #include "xf86.h" #include "xf86Config.h" #include "xf86_OSlib.h" @@ -602,7 +600,6 @@ configureFlagsSection (void) static XF86ConfModulePtr configureModuleSection (void) { -#ifdef XFree86LOADER char **elist, **el; /* Find the list of extension modules. */ const char *esubdirs[] = { @@ -613,10 +610,8 @@ configureModuleSection (void) "fonts", NULL }; -#endif parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec) -#ifdef XFree86LOADER elist = LoaderListDirs(esubdirs, NULL); if (elist) { for (el = elist; *el; el++) { @@ -653,7 +648,6 @@ configureModuleSection (void) } xfree(elist); } -#endif return ptr; } @@ -663,10 +657,8 @@ configureFilesSection (void) { parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec) -#ifdef XFree86LOADER if (xf86ModulePath) ptr->file_modulepath = strdup(xf86ModulePath); -#endif if (defaultFontPath) ptr->file_fontpath = strdup(defaultFontPath); if (rgbPath) @@ -788,10 +780,8 @@ DoConfigure() for (vl = vlist; *vl; vl++) ErrorF("\t%s\n", *vl); -#ifdef XFree86LOADER /* Load all the drivers that were found. */ xf86LoadModules(vlist, NULL); -#endif /* XFree86LOADER */ xfree(vlist); diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 88324eb19..53186ea3b 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -63,11 +63,7 @@ DGACopyModeInfo( XDGAModePtr xmode ); -#if defined(XFree86LOADER) || !defined(XFreeXDGA) _X_EXPORT int *XDGAEventBase = NULL; -#else -_X_EXPORT int *XDGAEventBase = &DGAEventBase; -#endif #define DGA_GET_SCREEN_PRIV(pScreen) \ ((DGAScreenPtr)((pScreen)->devPrivates[DGAScreenIndex].ptr)) diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c index b74f37e11..28064cb71 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -40,10 +40,8 @@ #include #include #include "os.h" -#ifdef XFree86LOADER #include "loaderProcs.h" #include "xf86Config.h" -#endif /* XFree86LOADER */ #include "xf86_OSlib.h" #include "xf86.h" #include "xf86Priv.h" @@ -55,7 +53,6 @@ DoProbe() Bool probeResult; Bool ioEnableFailed = FALSE; -#ifdef XFree86LOADER /* Find the list of video driver modules. */ char **list = xf86DriverlistFromCompile(); char **l; @@ -70,7 +67,6 @@ DoProbe() /* Load all the drivers that were found. */ xf86LoadModules(list, NULL); -#endif /* XFree86LOADER */ /* Disable PCI devices */ xf86AccessInit(); diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index 9f8c15651..c63ef1c3a 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -40,9 +40,7 @@ #include #include #include "os.h" -#ifdef XFree86LOADER #include "loaderProcs.h" -#endif #include "xf86.h" #include "xf86Priv.h" #include "xf86Pci.h" @@ -54,9 +52,7 @@ void DoScanPci(int argc, char **argv, int i) int j,skip,globalVerbose,scanpciVerbose; ScanPciSetupProcPtr PciSetup; ScanPciDisplayCardInfoProcPtr DisplayPCICardInfo; -#ifdef XFree86LOADER int errmaj, errmin; -#endif /* * first we need to finish setup of the OS so that we can call other @@ -95,7 +91,6 @@ void DoScanPci(int argc, char **argv, int i) /* * now get the loader set up and load the scanpci module */ -#ifdef XFree86LOADER /* Initialise the loader */ LoaderInit(); /* Tell the loader the default module search path */ @@ -113,10 +108,6 @@ void DoScanPci(int argc, char **argv, int i) PciSetup = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds"); DisplayPCICardInfo = (ScanPciDisplayCardInfoProcPtr)LoaderSymbol("ScanPciDisplayPCICardInfo"); -#else - PciSetup = ScanPciSetupPciIds; - DisplayPCICardInfo = ScanPciDisplayPCICardInfo; -#endif if (!(*PciSetup)()) FatalError("ScanPciSetupPciIds() failed\n"); diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index b3b5c1b29..1e0ac7996 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -189,14 +189,12 @@ Bool xf86Initialising = FALSE; Bool xf86ProbeFailed = FALSE; Bool xf86DoProbe = FALSE; Bool xf86DoConfigure = FALSE; -#ifdef XFree86LOADER DriverPtr *xf86DriverList = NULL; int xf86NumDrivers = 0; InputDriverPtr *xf86InputDriverList = NULL; int xf86NumInputDrivers = 0; ModuleInfoPtr *xf86ModuleInfoList = NULL; int xf86NumModuleInfos = 0; -#endif int xf86NumScreens = 0; const char *xf86VisualNames[] = { diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 1e7742761..ebc460f30 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -70,7 +70,6 @@ static int xf86ScrnInfoPrivateCount = 0; -#ifdef XFree86LOADER /* Add a pointer to a new DriverRec to xf86DriverList */ _X_EXPORT void @@ -172,7 +171,6 @@ xf86DeleteModuleInfo(int idx) xf86ModuleInfoList[idx] = NULL; } } -#endif /* Allocate a new ScrnInfoRec in xf86Screens */ @@ -199,11 +197,7 @@ xf86AllocateScreen(DriverPtr drv, int flags) xf86Screens[i]->drv = drv; drv->refCount++; -#ifdef XFree86LOADER xf86Screens[i]->module = DuplicateModule(drv->module, NULL); -#else - xf86Screens[i]->module = NULL; -#endif /* * set the initial access state. This will be modified after PreInit. * XXX Or should we do it some other place? @@ -260,10 +254,8 @@ xf86DeleteScreen(int scrnIndex, int flags) xf86OptionListFree(pScrn->options); -#ifdef XFree86LOADER if (pScrn->module) UnloadModule(pScrn->module); -#endif if (pScrn->drv) pScrn->drv->refCount--; @@ -321,11 +313,7 @@ xf86AllocateInput(InputDriverPtr drv, int flags) new->drv = drv; drv->refCount++; -#ifdef XFree86LOADER new->module = DuplicateModule(drv->module, NULL); -#else - new->module = NULL; -#endif new->next = xf86InputDevs; xf86InputDevs = new; return new; @@ -352,10 +340,8 @@ xf86DeleteInput(InputInfoPtr pInp, int flags) pInp->free(pInp, 0); #endif -#ifdef XFree86LOADER if (pInp->module) UnloadModule(pInp->module); -#endif if (pInp->drv) pInp->drv->refCount--; @@ -2381,17 +2367,12 @@ xf86GetVersion() _X_EXPORT CARD32 xf86GetModuleVersion(pointer module) { -#ifdef XFree86LOADER return (CARD32)LoaderGetModuleVersion(module); -#else - return 0; -#endif } _X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name) { -#ifdef XFree86LOADER pointer ret; int errmaj = 0, errmin = 0; @@ -2400,15 +2381,11 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name) if (!ret) LoaderErrorMsg(NULL, name, errmaj, errmin); return ret; -#else - return (pointer)1; -#endif } _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) { -#ifdef XFree86LOADER pointer ret; int errmaj = 0, errmin = 0; @@ -2417,9 +2394,6 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) if (!ret) LoaderErrorMsg(pScrn->name, name, errmaj, errmin); return ret; -#else - return (pointer)1; -#endif } /* @@ -2428,9 +2402,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) _X_EXPORT pointer xf86LoadOneModule(char *name, pointer opt) { -#ifdef XFree86LOADER int errmaj, errmin; -#endif char *Name; pointer mod; @@ -2452,13 +2424,9 @@ xf86LoadOneModule(char *name, pointer opt) return NULL; } -#ifdef XFree86LOADER mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin); if (!mod) LoaderErrorMsg(NULL, Name, errmaj, errmin); -#else - mod = (pointer)1; -#endif xfree(Name); return mod; } @@ -2470,7 +2438,7 @@ xf86UnloadSubModule(pointer mod) * This is disabled for now. The loader isn't smart enough yet to undo * relocations. */ -#if defined(XFree86LOADER) && 0 +#if 0 UnloadSubModule(mod); #endif } @@ -2478,59 +2446,47 @@ xf86UnloadSubModule(pointer mod) _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name) { -#ifdef XFree86LOADER return LoaderSymbol(name) != NULL; -#else - return TRUE; -#endif } _X_EXPORT void xf86LoaderReqSymLists(const char **list0, ...) { -#ifdef XFree86LOADER va_list ap; va_start(ap, list0); LoaderVReqSymLists(list0, ap); va_end(ap); -#endif } _X_EXPORT void xf86LoaderReqSymbols(const char *sym0, ...) { -#ifdef XFree86LOADER va_list ap; va_start(ap, sym0); LoaderVReqSymbols(sym0, ap); va_end(ap); -#endif } _X_EXPORT void xf86LoaderRefSymLists(const char **list0, ...) { -#ifdef XFree86LOADER va_list ap; va_start(ap, list0); LoaderVRefSymLists(list0, ap); va_end(ap); -#endif } _X_EXPORT void xf86LoaderRefSymbols(const char *sym0, ...) { -#ifdef XFree86LOADER va_list ap; va_start(ap, sym0); LoaderVRefSymbols(sym0, ap); va_end(ap); -#endif } diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index 4a02606d3..a14e9e7bb 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -35,11 +35,7 @@ #define _xf86InPriv_h /* xf86Globals.c */ -#ifdef XFree86LOADER extern InputDriverPtr *xf86InputDriverList; -#else -extern InputDriverPtr xf86InputDriverList[]; -#endif extern int xf86NumInputDrivers; /* xf86Xinput.c */ diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 3aed36974..993918426 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -62,9 +62,7 @@ #include "compiler.h" -#ifdef XFree86LOADER #include "loaderProcs.h" -#endif #ifdef XFreeXDGA #include "dgaproc.h" #endif @@ -114,12 +112,10 @@ extern void os2ServerVideoAccess(); void (*xf86OSPMClose)(void) = NULL; #endif -#ifdef XFree86LOADER static char *baseModules[] = { "pcidata", NULL }; -#endif /* Common pixmap formats */ @@ -272,10 +268,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) { int i, j, k, scr_index; static unsigned long generation = 0; -#ifdef XFree86LOADER char **modulelist; pointer *optionlist; -#endif screenLayoutPtr layout; Pix24Flags screenpix24, pix24; MessageType pix24From = X_DEFAULT; @@ -333,7 +327,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) if (!autoconfig) PostConfigInit(); -#ifdef XFree86LOADER /* Initialise the loader */ LoaderInit(); @@ -377,8 +370,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) if (!xf86LoadModules(baseModules, NULL)) FatalError("Unable to load required base modules, Exiting...\n"); -#endif - xf86OpenConsole(); /* Do a general bus probe. This will be a PCI probe for x86 platforms */ @@ -401,7 +392,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) /* Initialise the resource broker */ xf86ResourceBrokerInit(); -#ifdef XFree86LOADER /* Load all modules specified explicitly in the config file */ if ((modulelist = xf86ModulelistFromConfig(&optionlist))) { xf86LoadModules(modulelist, optionlist); @@ -432,7 +422,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) * XXX Nothing keeps track of them for other modules. */ /* XXX What do we do if not all of these could be loaded? */ -#endif /* * At this point, xf86DriverList[] is all filled in with entries for @@ -672,12 +661,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) exit(0); } -#ifdef XFree86LOADER /* Remove (unload) drivers that are not required */ for (i = 0; i < xf86NumDrivers; i++) if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0) xf86DeleteDriver(i); -#endif /* * At this stage we know how many screens there are. @@ -982,12 +969,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) #endif } -#ifdef XFree86LOADER if ((serverGeneration == 1) && LoaderCheckUnresolved(LD_RESOLV_IFDONE)) { /* For now, just a warning */ xf86Msg(X_WARNING, "Some symbols could not be resolved!\n"); } -#endif xf86PostScreenInit(); @@ -1167,9 +1152,7 @@ OsVendorInit() signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */ #endif OsDelayInitColors = TRUE; -#ifdef XFree86LOADER loadableFonts = TRUE; -#endif if (!beenHere) xf86LogInit(); @@ -1461,9 +1444,7 @@ ddxProcessArgument(int argc, char **argv, int i) } if (!strcmp(argv[i],"-ignoreABI")) { -#ifdef XFree86LOADER LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL); -#endif return 1; } if (!strcmp(argv[i],"-verbose")) @@ -1870,9 +1851,7 @@ xf86PrintBanner() #endif ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n" "\tto make sure that you have the latest version.\n"); -#ifdef XFree86LOADER ErrorF("Module Loader present\n"); -#endif } static void @@ -1919,7 +1898,6 @@ xf86RunVtInit(void) } } -#ifdef XFree86LOADER /* * xf86LoadModules iterates over a list that is being passed in. */ @@ -1962,8 +1940,6 @@ xf86LoadModules(char **list, pointer *optlist) return !failed; } -#endif - /* Pixmap format stuff */ _X_EXPORT PixmapFormatPtr diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index 80fbf417d..bdb02cef0 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -459,12 +459,10 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd) mseParamsPtr mse = structure; InputInfoPtr pInfo; MouseDevPtr pMse; -#ifdef XFree86LOADER pointer xf86MouseProtocolIDToName = LoaderSymbol("xf86MouseProtocolIDToName"); if (!xf86MouseProtocolIDToName) return MISC_RET_NOMODULE; -#endif if (mse->type < MTYPE_MICROSOFT || ( mse->type > MTYPE_EXPPS2 && (mse->type!=MTYPE_OSMOUSE && mse->type!=MTYPE_XQUEUE))) @@ -563,12 +561,8 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd) pMse->chordMiddle = mse->chordmiddle; pMse->mouseFlags = mse->flags; -#ifdef XFree86LOADER pMse->protocol = ((const char *(*)(MouseProtocolID)) xf86MouseProtocolIDToName)(pMse->protocolID); -#else - pMse->protocol = xf86MouseProtocolIDToName(pMse->protocolID); -#endif if (mse->device) { if (MiscExtAuthorizeDevice(pInfo, mse->device)) { diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 0794de777..f97bbb352 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -95,13 +95,9 @@ extern unsigned short xf86MouseCflags[]; extern Bool xf86SupportedMouseTypes[]; extern int xf86NumMouseTypes; -#ifdef XFree86LOADER extern DriverPtr *xf86DriverList; extern ModuleInfoPtr *xf86ModuleInfoList; extern int xf86NumModuleInfos; -#else -extern DriverPtr xf86DriverList[]; -#endif extern int xf86NumDrivers; extern Bool xf86Resetting; extern Bool xf86Initialising; diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 4d587a13f..844496618 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -1690,19 +1690,12 @@ xf86PciProbe(void) /* * Initialise the pcidata entry points. */ -#ifdef XFree86LOADER xf86SetupPciIds = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds"); xf86ClosePciIds = (ScanPciCloseProcPtr)LoaderSymbol("ScanPciClosePciIds"); xf86FindPciNamesByDevice = (ScanPciFindByDeviceProcPtr)LoaderSymbol("ScanPciFindPciNamesByDevice"); xf86FindPciNamesBySubsys = (ScanPciFindBySubsysProcPtr)LoaderSymbol("ScanPciFindPciNamesBySubsys"); -#else - xf86SetupPciIds = ScanPciSetupPciIds; - xf86ClosePciIds = ScanPciClosePciIds; - xf86FindPciNamesByDevice = ScanPciFindPciNamesByDevice; - xf86FindPciNamesBySubsys = ScanPciFindPciNamesBySubsys; -#endif if (!xf86SetupPciIds()) FatalError("xf86SetupPciIds() failed\n"); diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 25e3a20bb..70e32616c 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -319,7 +319,6 @@ typedef struct _DriverRec { #define HaveDriverFuncs 1 -#ifdef XFree86LOADER /* * The optional module list struct. This allows modules exporting helping * functions to configuration tools, the Xserver, or any other @@ -333,7 +332,6 @@ typedef struct _ModuleInfoRec { const OptionInfoRec * (*AvailableOptions)(void *unused); pointer unused[8]; /* leave some space for more fields */ } ModuleInfoRec, *ModuleInfoPtr; -#endif /* * These are the private bus types. New types can be added here. Types diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index ede2e064e..a7cbd0e26 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -53,9 +53,7 @@ #include #include #include "xvdix.h" -#ifdef XFree86LOADER #include "xvmodproc.h" -#endif #include "xf86xvpriv.h" @@ -118,16 +116,9 @@ int XF86XvScreenIndex = -1; static unsigned long XF86XVGeneration = 0; static unsigned long PortResource = 0; -#ifdef XFree86LOADER int (*XvGetScreenIndexProc)(void) = NULL; unsigned long (*XvGetRTPortProc)(void) = NULL; int (*XvScreenInitProc)(ScreenPtr) = NULL; -#else -int (*XvGetScreenIndexProc)(void) = XvGetScreenIndex; -unsigned long (*XvGetRTPortProc)(void) = XvGetRTPort; -int (*XvScreenInitProc)(ScreenPtr) = XvScreenInit; -#endif - #define GET_XV_SCREEN(pScreen) \ ((XvScreenPtr)((pScreen)->devPrivates[XF86XvScreenIndex].ptr)) diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index 40c82c75d..7dc4e9dfc 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -41,19 +41,13 @@ #include "resource.h" #include "dixstruct.h" -#ifdef XFree86LOADER #include "xvmodproc.h" -#endif #include "xf86xvpriv.h" #include "xf86xvmc.h" typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr); -#ifdef XFree86LOADER _X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL; -#else -_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = XvMCScreenInit; -#endif typedef struct { diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am index 0f563869a..7cfff4763 100644 --- a/hw/xfree86/ddc/Makefile.am +++ b/hw/xfree86/ddc/Makefile.am @@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) EXTRA_DIST = ddcPriv.h DDC.HOWTO diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 8822bacc1..564e72e3c 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -121,14 +121,12 @@ static const OptionInfoRec DDCOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE }, }; -#ifdef XFree86LOADER /*ARGSUSED*/ static const OptionInfoRec * DDCAvailableOptions(void *unused) { return (DDCOptions); } -#endif /** * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 9023a0cb0..65dad8a86 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -31,7 +31,7 @@ fontsmoduledir = $(moduledir)/fonts fontsmodule_LTLIBRARIES = libfreetype.la \ libtype1.la -AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/afb \ -I$(top_srcdir)/cfb \ @@ -64,6 +64,7 @@ libdbe_la_SOURCES = dbemodule.c libfb_la_LDFLAGS = -avoid-version libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c +libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) libglx_la_LDFLAGS = -avoid-version if AIGLX @@ -93,6 +94,7 @@ libtype1_la_LDFLAGS = -avoid-version libtype1_la_SOURCES = type1mod.c libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c +libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS) libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am index 0b1245dd7..229d4e592 100644 --- a/hw/xfree86/dixmods/extmod/Makefile.am +++ b/hw/xfree86/dixmods/extmod/Makefile.am @@ -11,7 +11,7 @@ if XV XV_SRCS = xvmod.c xvmodproc.h endif -AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/afb \ -I$(top_srcdir)/mfb \ diff --git a/hw/xfree86/doc/sgml/DESIGN.sgml b/hw/xfree86/doc/sgml/DESIGN.sgml index 84e4fad21..5beff653f 100644 --- a/hw/xfree86/doc/sgml/DESIGN.sgml +++ b/hw/xfree86/doc/sgml/DESIGN.sgml @@ -6436,7 +6436,6 @@ static PciChipsets ZZZPciChipsets[] = { driver. This is required for the dynamically loaded version:

-#ifdef XFree86LOADER static XF86ModuleVersionInfo zzzVersRec = { "zzz", @@ -6450,7 +6449,6 @@ static XF86ModuleVersionInfo zzzVersRec = MOD_CLASS_VIDEODRV, {0,0,0,0} }; -#endif

Define a data structure to hold the driver's screen-specific data. @@ -6508,9 +6506,7 @@ static const OptionInfoRec ZZZOptions[] = { the driver to the main list of drivers. -#ifdef XFree86LOADER - -static MODULESETUPPROTO(mgaSetup); +static MODULESETUPPROTO(zzzSetup); XF86ModuleData zzzModuleData = { &zzzVersRec, zzzSetup, NULL }; @@ -6540,7 +6536,6 @@ zzzSetup(pointer module, pointer opts, int *errmaj, int *errmin) return NULL; } } -#endif GetRec, FreeRec diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 6de88e2bb..e711846b2 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -7,9 +7,9 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_builddir)/GL/include \ -I@MESA_SOURCE@/include \ -DHAVE_XORG_CONFIG_H \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + \ + \ + \ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@ \ @GL_CFLAGS@ diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index b58b670a2..462b9ad44 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -69,7 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "mi.h" #include "mipointer.h" -#if defined(XFree86LOADER) && !defined(PANORAMIX) +#if !defined(PANORAMIX) extern Bool noPanoramiXExtension; #endif @@ -135,14 +135,9 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) * If Xinerama is on, don't allow DRI to initialise. It won't be usable * anyway. */ -#if defined(PANORAMIX) && !defined(XFree86LOADER) - xineramaInCore = TRUE; -#elif defined(XFree86LOADER) if (xf86LoaderCheckSymbol("noPanoramiXExtension")) xineramaInCore = TRUE; -#endif -#if defined(PANORAMIX) || defined(XFree86LOADER) if (xineramaInCore) { if (!noPanoramiXExtension) { DRIDrvMsg(pScreen->myNum, X_WARNING, @@ -150,7 +145,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) return FALSE; } } -#endif drmWasAvailable = drmAvailable(); diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am index ab62a6b54..bd69b570a 100644 --- a/hw/xfree86/dummylib/Makefile.am +++ b/hw/xfree86/dummylib/Makefile.am @@ -6,7 +6,7 @@ noinst_LIBRARIES = libdummy.a libdummy-nonserver.a INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) if NEED_STRLCAT STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am index 7f0a20e4c..1a2831c10 100644 --- a/hw/xfree86/exa/Makefile.am +++ b/hw/xfree86/exa/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ -I$(srcdir)/../../../exa \ -I$(srcdir)/../../../miext/cw -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) libexa_la_SOURCES = \ examodule.c diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am index 9d79fa7f5..10de50e83 100644 --- a/hw/xfree86/fbdevhw/Makefile.am +++ b/hw/xfree86/fbdevhw/Makefile.am @@ -11,7 +11,7 @@ endif INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) sdk_HEADERS = fbdevhw.h diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am index 6e36f0cc8..cbf4f6571 100644 --- a/hw/xfree86/i2c/Makefile.am +++ b/hw/xfree86/i2c/Makefile.am @@ -15,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h diff --git a/hw/xfree86/i2c/bt829.h b/hw/xfree86/i2c/bt829.h index 2c7c00d34..bca9d37de 100644 --- a/hw/xfree86/i2c/bt829.h +++ b/hw/xfree86/i2c/bt829.h @@ -82,8 +82,6 @@ int bt829_SetCC(BT829Ptr bt); "bt829_SetOUT_EN", \ "bt829_SetP_IO" -#ifdef XFree86LOADER - #define xf86_bt829_Detect ((BT829Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("bt829_Detect")) #define xf86_bt829_ATIInit ((int (*)(BT829Ptr))LoaderSymbol("bt829_ATIInit")) #define xf86_bt829_SetFormat ((int (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetFormat")) @@ -96,20 +94,4 @@ int bt829_SetCC(BT829Ptr bt); #define xf86_bt829_SetOUT_EN ((void (*)(BT829Ptr, Bool))LoaderSymbol("bt829_SetOUT_EN")) #define xf86_bt829_SetP_IO ((void (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetP_IO")) -#else - -#define xf86_bt829_Detect bt829_Detect -#define xf86_bt829_ATIInit bt829_ATIInit -#define xf86_bt829_SetFormat bt829_SetFormat -#define xf86_bt829_SetMux bt829_SetMux -#define xf86_bt829_SetCaptSize bt829_SetCaptSize -#define xf86_bt829_SetBrightness bt829_SetBrightness -#define xf86_bt829_SetContrast bt829_SetContrast -#define xf86_bt829_SetSaturation bt829_SetSaturation -#define xf86_bt829_SetTint bt829_SetTint -#define xf86_bt829_SetOUT_EN bt829_SetOUT_EN -#define xf86_bt829_SetP_IO bt829_SetP_IO - -#endif - #endif diff --git a/hw/xfree86/i2c/fi1236.h b/hw/xfree86/i2c/fi1236.h index 7c1d07024..eda1c781c 100644 --- a/hw/xfree86/i2c/fi1236.h +++ b/hw/xfree86/i2c/fi1236.h @@ -100,8 +100,6 @@ void fi1236_dump_status(FI1236Ptr f); "FI1236_set_tuner_type", \ "TUNER_set_frequency" -#ifdef XFree86LOADER - #define xf86_Detect_FI1236 ((FI1236Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_FI1236")) #define xf86_FI1236_set_tuner_type ((void (*)(FI1236Ptr, int))LoaderSymbol("FI1236_set_tuner_type")) #define xf86_TUNER_set_frequency ((void (*)(FI1236Ptr, CARD32))LoaderSymbol("TUNER_set_frequency")) @@ -109,15 +107,4 @@ void fi1236_dump_status(FI1236Ptr f); #define xf86_TUNER_get_afc_hint ((int (*)(FI1236Ptr))LoaderSymbol("TUNER_get_afc_hint")) #define xf86_fi1236_dump_status ((void (*)(FI1236Ptr))LoaderSymbol("fi1236_dump_status")) -#else - -#define xf86_Detect_FI1236 Detect_FI1236 -#define xf86_FI1236_set_tuner_type FI1236_set_tuner_type -#define xf86_TUNER_set_frequency TUNER_set_frequency -#define xf86_FI1236_AFC FI1236_AFC -#define xf86_TUNER_get_afc_hint TUNER_get_afc_hint -#define xf86_fi1236_dump_status fi1236_dump_status - -#endif - #endif diff --git a/hw/xfree86/i2c/i2c_def.h b/hw/xfree86/i2c/i2c_def.h index 84b9c5d91..6e119e478 100644 --- a/hw/xfree86/i2c/i2c_def.h +++ b/hw/xfree86/i2c/i2c_def.h @@ -3,8 +3,6 @@ /* the following are a workaround for possible loader bug.. WATCH function types ! */ -#if XFree86LOADER - #define CreateI2CBusRec ((pointer (*)(void))LoaderSymbol("xf86CreateI2CBusRec")) #define DestroyI2CBusRec ((pointer (*)(I2CBusPtr, Bool, Bool))LoaderSymbol("xf86DestroyI2CBusRec")) #define I2CBusInit ((Bool (*)(pointer))LoaderSymbol("xf86I2CBusInit")) @@ -13,17 +11,4 @@ #define I2CDevInit ((Bool (*)(I2CDevPtr))LoaderSymbol("xf86I2CDevInit")) #define I2CProbeAddress ((Bool (*)(I2CBusPtr,I2CSlaveAddr))LoaderSymbol("xf86I2CProbeAddress")) -#else - -#define CreateI2CBusRec xf86CreateI2CBusRec -#define DestroyI2CBusRec xf86DestroyI2CBusRec -#define I2CBusInit xf86I2CBusInit -#define I2C_WriteRead xf86I2CWriteRead -#define CreateI2CDevRec xf86CreateI2CDevRec -#define I2CDevInit xf86I2CDevInit -#define I2CProbeAddress xf86I2CProbeAddress - -#endif - - #endif diff --git a/hw/xfree86/i2c/msp3430.h b/hw/xfree86/i2c/msp3430.h index 8726bacf5..1cb9b869d 100644 --- a/hw/xfree86/i2c/msp3430.h +++ b/hw/xfree86/i2c/msp3430.h @@ -105,22 +105,10 @@ void MSP3430SetSAP (MSP3430Ptr m, int mode); "MSP3430SetVolume", \ "MSP3430SetSAP" -#ifdef XFree86LOADER - #define xf86_DetectMSP3430 ((MSP3430Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("DetectMSP3430")) #define xf86_ResetMSP3430 ((void (*)(MSP3430Ptr))LoaderSymbol("ResetMSP3430")) #define xf86_MSP3430SetVolume ((void (*)(MSP3430Ptr, CARD8))LoaderSymbol("MSP3430SetVolume")) #define xf86_MSP3430SetSAP ((void (*)(MSP3430Ptr, int))LoaderSymbol("MSP3430SetSAP")) #define xf86_InitMSP3430 ((void (*)(MSP3430Ptr))LoaderSymbol("InitMSP3430")) -#else - -#define xf86_DetectMSP3430 DetectMSP3430 -#define xf86_ResetMSP3430 ResetMSP3430 -#define xf86_MSP3430SetVolume MSP3430SetVolume -#define xf86_MSP3430SetSAP MSP3430SetSAP -#define xf86_InitMSP3430 InitMSP3430 - -#endif - #endif diff --git a/hw/xfree86/i2c/tda8425.h b/hw/xfree86/i2c/tda8425.h index ec1908ba9..4abb4175f 100644 --- a/hw/xfree86/i2c/tda8425.h +++ b/hw/xfree86/i2c/tda8425.h @@ -34,20 +34,9 @@ void tda8425_mute(TDA8425Ptr t, Bool mute); "tda8425_setaudio", \ "tda8425_mute" -#ifdef XFree86LOADER - #define xf86_Detect_tda8425 ((TDA8425Ptr (*)(I2CBusPtr, I2CSlaveAddr,Bool))LoaderSymbol("Detect_tda8425")) #define xf86_tda8425_init ((Bool (*)(TDA8425Ptr))LoaderSymbol("tda8425_init")) #define xf86_tda8425_setaudio ((void (*)(TDA8425Ptr))LoaderSymbol("tda8425_setaudio")) #define xf86_tda8425_mute ((void (*)(TDA8425Ptr, Bool))LoaderSymbol("tda8425_mute")) -#else - -#define xf86_Detect_tda8425 Detect_tda8425 -#define xf86_tda8425_init tda8425_init -#define xf86_tda8425_setaudio tda8425_setaudio -#define xf86_tda8425_mute tda8425_mute - -#endif - #endif diff --git a/hw/xfree86/i2c/tda9850.h b/hw/xfree86/i2c/tda9850.h index 2c8ddcc6e..d5dec36fe 100644 --- a/hw/xfree86/i2c/tda9850.h +++ b/hw/xfree86/i2c/tda9850.h @@ -29,8 +29,6 @@ CARD16 tda9850_getstatus(TDA9850Ptr t); "tda9850_mute", \ "tda9850_sap_mute" -#ifdef XFree86LOADER - #define xf86_Detect_tda9850 ((TDA9850Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9850")) #define xf86_tda9850_init ((Bool (*)(TDA9850Ptr))LoaderSymbol("tda9850_init")) #define xf86_tda9850_setaudio ((void (*)(TDA9850Ptr))LoaderSymbol("tda9850_setaudio")) @@ -38,15 +36,4 @@ CARD16 tda9850_getstatus(TDA9850Ptr t); #define xf86_tda9850_sap_mute ((void (*)(TDA9850Ptr, Bool))LoaderSymbol("tda9850_sap_mute")) #define xf86_tda9850_getstatus ((CARD16 (*)(TDA9850Ptr))LoaderSymbol("tda9850_getstatus")) -#else - -#define xf86_Detect_tda9850 Detect_tda9850 -#define xf86_tda9850_init tda9850_init -#define xf86_tda9850_setaudio tda9850_setaudio -#define xf86_tda9850_mute tda9850_mute -#define xf86_tda9850_sap_mute tda9850_sap_mute -#define xf86_tda9850_getstatus tda9850_getstatus - -#endif - #endif diff --git a/hw/xfree86/i2c/tda9885.h b/hw/xfree86/i2c/tda9885.h index a63b34764..46ae9fc0d 100644 --- a/hw/xfree86/i2c/tda9885.h +++ b/hw/xfree86/i2c/tda9885.h @@ -51,22 +51,10 @@ void tda9885_dumpstatus(TDA9885Ptr t); "tda9885_setaudio", \ "tda9885_mute" -#ifdef XFree86LOADER - #define xf86_Detect_tda9885 ((TDA9885Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9885")) #define xf86_tda9885_init ((Bool (*)(TDA9885Ptr))LoaderSymbol("tda9885_init")) #define xf86_tda9885_setparameters ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_setparameters")) #define xf86_tda9885_getstatus ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_getstatus")) #define xf86_tda9885_dumpstatus ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_dumpstatus")) -#else - -#define xf86_Detect_tda9885 Detect_tda9885 -#define xf86_tda9885_init tda9885_init -#define xf86_tda9885_setparameters tda9885_setparameters -#define xf86_tda9885_getstatus tda9885_getstatus -#define xf86_tda9885_dumpstatus tda9885_dumpstatus - -#endif - #endif diff --git a/hw/xfree86/i2c/uda1380.h b/hw/xfree86/i2c/uda1380.h index acf96c556..95ad92b92 100644 --- a/hw/xfree86/i2c/uda1380.h +++ b/hw/xfree86/i2c/uda1380.h @@ -66,8 +66,6 @@ void uda1380_dumpstatus(UDA1380Ptr t); "uda1380_getstatus", \ "uda1380_dumpstatus" -#ifdef XFree86LOADER - #define xf86_Detect_uda1380 ((UDA1380Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_uda1380")) #define xf86_uda1380_init ((Bool (*)(UDA1380Ptr))LoaderSymbol("uda1380_init")) #define xf86_uda1380_shutdown ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_shutdown")) @@ -77,17 +75,4 @@ void uda1380_dumpstatus(UDA1380Ptr t); #define xf86_uda1380_getstatus ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_getstatus")) #define xf86_uda1380_dumpstatus ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_dumpstatus")) -#else - -#define xf86_Detect_uda1380 Detect_uda1380 -#define xf86_uda1380_init uda1380_init -#define xf86_uda1380_shutdown uda1380_shutdown -#define xf86_uda1380_setvolume uda1380_setvolume -#define xf86_uda1380_mute uda1380_mute -#define xf86_uda1380_setparameters uda1380_setparameters -#define xf86_uda1380_getstatus uda1380_getstatus -#define xf86_uda1380_dumpstatus uda1380_dumpstatus - -#endif - #endif diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index f606f5e12..130e0853c 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libint10.la sdk_HEADERS = xf86int10.h -EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +EXTRA_CFLAGS = libint10_la_LDFLAGS = -avoid-version diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 0cda5c159..357af77b6 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \ -I$(srcdir)/../ddc -I$(srcdir)/../i2c #AM_LDFLAGS = -r -AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) if XORG_LOADER_SPARC SPARC_SOURCES = SparcMulDiv.S diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am index ae89a6bf6..20885e866 100644 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ b/hw/xfree86/os-support/bsd/Makefile.am @@ -50,7 +50,7 @@ ARCH_SOURCES = \ endif # FIXME: NetBSD Aperture defines (configure.ac) -AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index bc99f2914..895d64e15 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -36,9 +36,7 @@ #include #include -#ifdef XFree86LOADER #include "misc.h" -#endif #include "xf86.h" #define JS_RETURN sizeof(struct joystick) @@ -174,7 +172,6 @@ xf86JoystickGetState(int fd, int *x, int *y, int *buttons) return 1; } -#ifdef XFree86LOADER /* * Entry point for XFree86 Loader */ @@ -184,5 +181,4 @@ bsd_jstkModuleInit(pointer *data, INT32 *magic) *magic = MAGIC_DONE; *data = NULL; } -#endif /* end of bsd_jstk.c */ diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 308a01b31..c56f3d717 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -53,6 +53,6 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) EXTRA_DIST = $(sdk_HEADERS) diff --git a/hw/xfree86/os-support/drm/Makefile.am b/hw/xfree86/os-support/drm/Makefile.am index 8270f4304..53893251a 100644 --- a/hw/xfree86/os-support/drm/Makefile.am +++ b/hw/xfree86/os-support/drm/Makefile.am @@ -7,9 +7,8 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/include \ -DHAVE_XORG_CONFIG_H \ - @LIBDRM_CFLAGS@ \ - @SERVER_DEFINES@ \ - @LOADER_DEFINES@ + @LIBDRM_CFLAGS@ + libdrm_la_LDFLAGS = -module -avoid-version libdrm_ladir = $(moduledir)/@XORG_OS@ libdrm_la_SOURCES = \ diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c index a4663048b..f3d774521 100644 --- a/hw/xfree86/os-support/drm/xf86drm.c +++ b/hw/xfree86/os-support/drm/xf86drm.c @@ -37,18 +37,10 @@ #include #endif -#ifdef XFree86Server -# include "xf86.h" -# include "xf86_OSproc.h" -# define _DRM_MALLOC xalloc -# define _DRM_FREE xfree -# ifndef XFree86LOADER -# include -# endif -#else -# define _DRM_MALLOC malloc -# define _DRM_FREE free -#endif +#include "xf86.h" +#include "xf86_OSproc.h" +#define _DRM_MALLOC xalloc +#define _DRM_FREE xfree #include "drm.h" #include @@ -124,19 +116,9 @@ drmMsg(const char *format, ...) { va_list ap; -#ifndef XFree86Server - const char *env; - if ((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose")) -#endif - { - va_start(ap, format); -#ifdef XFree86Server - xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); -#else - vfprintf(stderr, format, ap); -#endif - va_end(ap); - } + va_start(ap, format); + xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); + va_end(ap); } static void *drmHashTable = NULL; /* Context switch callbacks */ @@ -270,19 +252,15 @@ static int drmOpenDevice(long dev, int minor) int fd; mode_t devmode = DRM_DEV_MODE; int isroot = !geteuid(); -#if defined(XFree86Server) uid_t user = DRM_DEV_UID; gid_t group = DRM_DEV_GID; -#endif sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); drmMsg("drmOpenDevice: node name is %s\n", buf); -#if defined(XFree86Server) devmode = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE; devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID; -#endif if (stat(DRM_DIR_NAME, &st)) { if (!isroot) return DRM_ERR_NOT_ROOT; @@ -297,10 +275,8 @@ static int drmOpenDevice(long dev, int minor) remove(buf); mknod(buf, S_IFCHR | devmode, dev); } -#if defined(XFree86Server) chown(buf, user, group); chmod(buf, devmode); -#endif fd = open(buf, O_RDWR, 0); drmMsg("drmOpenDevice: open result is %d, (%s)\n", @@ -314,10 +290,8 @@ static int drmOpenDevice(long dev, int minor) if (!isroot) return DRM_ERR_NOT_ROOT; remove(buf); mknod(buf, S_IFCHR | devmode, dev); -#if defined(XFree86Server) chown(buf, user, group); chmod(buf, devmode); -#endif } fd = open(buf, O_RDWR, 0); drmMsg("drmOpenDevice: open result is %d, (%s)\n", @@ -454,16 +428,12 @@ static int drmOpenByName(const char *name) char * id; if (!drmAvailable()) { -#if !defined(XFree86Server) - return -1; -#else /* try to load the kernel module now */ if (!xf86LoadKernelModule(name)) { ErrorF("[drm] failed to load kernel module \"%s\"\n", name); return -1; } -#endif } /* @@ -546,7 +516,6 @@ static int drmOpenByName(const char *name) */ int drmOpen(const char *name, const char *busid) { -#ifdef XFree86Server if (!drmAvailable() && name != NULL) { /* try to load the kernel */ if (!xf86LoadKernelModule(name)) { @@ -555,7 +524,6 @@ int drmOpen(const char *name, const char *busid) return -1; } } -#endif if (busid) { int fd; @@ -2259,7 +2227,6 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, return 0; } -#if defined(XFree86Server) static void drmSIGIOHandler(int interrupt, void *closure) { unsigned long key; @@ -2323,4 +2290,3 @@ int drmRemoveSIGIOHandler(int fd) return xf86RemoveSIGIOHandler(fd); } -#endif diff --git a/hw/xfree86/os-support/drm/xf86drmHash.c b/hw/xfree86/os-support/drm/xf86drmHash.c index a2567080a..ae967b22f 100644 --- a/hw/xfree86/os-support/drm/xf86drmHash.c +++ b/hw/xfree86/os-support/drm/xf86drmHash.c @@ -81,9 +81,7 @@ #if !HASH_MAIN # include "drm.h" # include "xf86drm.h" -# ifdef XFree86LOADER -# include "xf86.h" -# endif +# include "xf86.h" #endif #define N(x) drm##x diff --git a/hw/xfree86/os-support/drm/xf86drmRandom.c b/hw/xfree86/os-support/drm/xf86drmRandom.c index cc40dccad..e3e94a2af 100644 --- a/hw/xfree86/os-support/drm/xf86drmRandom.c +++ b/hw/xfree86/os-support/drm/xf86drmRandom.c @@ -84,9 +84,7 @@ #if !RANDOM_MAIN # include "drm.h" # include "xf86drm.h" -# ifdef XFree86LOADER -# include "xf86.h" -# endif +# include "xf86.h" #endif #define N(x) drm##x diff --git a/hw/xfree86/os-support/drm/xf86drmSL.c b/hw/xfree86/os-support/drm/xf86drmSL.c index 23283a950..e94825009 100644 --- a/hw/xfree86/os-support/drm/xf86drmSL.c +++ b/hw/xfree86/os-support/drm/xf86drmSL.c @@ -53,12 +53,7 @@ #else # include "drm.h" # include "xf86drm.h" -# ifdef XFree86LOADER -# include "xf86.h" -# else -# include -# include -# endif +# include "xf86.h" #endif #define N(x) drm##x diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index d492f962e..6fdc1bc42 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -34,7 +34,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ $(APM_SOURCES) \ $(PLATFORM_PCI_SUPPORT) -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index a91137810..4f9e62b51 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -18,12 +18,6 @@ #else #define DEV_MEM "/dev/mem" #endif -#ifndef XFree86LOADER -#include -#ifndef MAP_FAILED -#define MAP_FAILED ((void *)-1) -#endif -#endif #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1) #define SHMERRORPTR (pointer)(-1) diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 667586359..36a81e490 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -40,9 +40,7 @@ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Ex #include #include -#ifdef XFree86LOADER #include "xf86.h" -#endif #if !defined(JSIOCGTIMELIMIT) /* make 2.1.x joystick.h backward compatable */ @@ -172,7 +170,6 @@ xf86JoystickGetState(int fd, int *x, int *y, int *buttons) return 1; } -#ifdef XFree86LOADER /* * Entry point for XFree86 Loader */ @@ -182,6 +179,5 @@ linux_jstkModuleInit(pointer *data, INT32 *magic) *magic = MAGIC_DONE; *data = NULL; } -#endif /* end of lnx_jstk.c */ diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index 5ce23a1f1..f546e1a92 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES) INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index ecdc1cdd7..8d47805fe 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -58,22 +58,11 @@ #include #endif -#ifdef XFree86Server # include # include "xf86.h" # include "xf86Priv.h" # include "xf86_OSlib.h" # include "inputstr.h" -#else -# include -# include -# include -# include -# include -# include -# include -# define SYSCALL(call) while(((call) == -1) && (errno == EINTR)) -#endif /* * Linux libc5 defines FASYNC, but not O_ASYNC. Don't know if it is @@ -126,11 +115,9 @@ xf86SIGIO (int sig) xf86SigIOFuncs[i].closure); r--; } -#ifdef XFree86Server if (r > 0) { xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r); } -#endif } static int @@ -159,24 +146,14 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) return 0; blocked = xf86BlockSIGIO(); if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) { -#ifdef XFree86Server xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n", fd, strerror(errno)); -#else - fprintf(stderr,"fcntl(%d, O_ASYNC): %s\n", - fd, strerror(errno)); -#endif xf86UnblockSIGIO(blocked); return 0; } if (fcntl(fd, F_SETOWN, getpid()) == -1) { -#ifdef XFree86Server xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n", fd, strerror(errno)); -#else - fprintf(stderr,"fcntl(%d, F_SETOWN): %s\n", - fd, strerror(errno)); -#endif xf86UnblockSIGIO(blocked); return 0; } @@ -289,7 +266,6 @@ xf86UnblockSIGIO (int wasset) } } -#ifdef XFree86Server void xf86AssertBlockedSIGIO (char *where) { @@ -308,5 +284,3 @@ xf86SIGIOSupported (void) { return 1; } - -#endif diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index eb5e2db2c..db54e53d3 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -31,7 +31,6 @@ #include #endif -#ifdef XFree86Server #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif @@ -39,13 +38,6 @@ # include "xf86.h" # include "xf86Priv.h" # include "xf86_OSlib.h" -#else -# include -# include -# include -# include -# include -#endif _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) @@ -70,12 +62,10 @@ xf86UnblockSIGIO (int wasset) { } -#ifdef XFree86Server void xf86AssertBlockedSIGIO (char *where) { } -#endif /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ Bool diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am index 63b8e9a90..6b29b3080 100644 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ b/hw/xfree86/os-support/solaris/Makefile.am @@ -34,7 +34,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) sdk_HEADERS = agpgart.h nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 83ce9ed2b..7922fde4e 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -212,9 +212,7 @@ extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *); extern int xf86RemoveSIGIOHandler(int fd); extern int xf86BlockSIGIO (void); extern void xf86UnblockSIGIO (int); -#ifdef XFree86Server extern void xf86AssertBlockedSIGIO (char *); -#endif extern Bool xf86SIGIOSupported (void); #ifdef XF86_OS_PRIVS diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index 25dabfe89..31c0cac99 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -28,33 +28,27 @@ /* Handle */ -#ifndef IN_MODULE +#ifndef __OS2ELF__ # include -#else /* !IN_MODULE */ -# ifndef __OS2ELF__ -# include -# else /* __OS2ELF__ */ - /* EMX/gcc_elf under OS/2 does not have native header files */ -# if !defined (_VA_LIST) -# define _VA_LIST - typedef char *va_list; -# endif -# define _VA_ROUND(t) ((sizeof (t) + 3) & -4) -# if !defined (va_start) -# define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4) -# define va_end(ap) (ap = 0, (void)0) -# define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t))) -# endif -# endif /* __OS2ELF__ */ -#endif /* IN_MODULE */ +#else /* __OS2ELF__ */ + /* EMX/gcc_elf under OS/2 does not have native header files */ +# if !defined (_VA_LIST) +# define _VA_LIST + typedef char *va_list; +# endif +# define _VA_ROUND(t) ((sizeof (t) + 3) & -4) +# if !defined (va_start) +# define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4) +# define va_end(ap) (ap = 0, (void)0) +# define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t))) +# endif +#endif /* __OS2ELF__ */ /* * The first set of definitions are required both for modules and * libc_wrapper.c. */ -#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES) - #if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || \ defined(__SCO__) || defined(__UNIXWARE__) #define HAVE_VSSCANF @@ -133,9 +127,6 @@ #define MAXLONG LONG_MAX #endif -#endif /* XFree86LOADER || NEED_XF86_TYPES */ - -#if defined(XFree86LOADER) || defined(NEED_XF86_PROTOTYPES) /* * ANSI C compilers only. */ @@ -321,21 +312,6 @@ extern void xf86longjmp(xf86jmp_buf env, int val); (xf86getjmptype() == 1 ? xf86setjmp1((env), xf86setjmp1_arg2()) : \ xf86setjmperror((env)))) -#else /* XFree86LOADER || NEED_XF86_PROTOTYPES */ -#include -#include -#include -#include -#include -#include -#ifdef HAVE_SYSV_IPC -#include -#include -#endif -#include -#define stat_t struct stat -#endif /* XFree86LOADER || NEED_XF86_PROTOTYPES */ - /* * These things are always required by drivers (but not by libc_wrapper.c), * even for a static server because some OSs don't provide them. diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index 5a6056ba9..75b622529 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -53,8 +53,6 @@ * libc_wrapper.c. */ -#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES) - /* * First, the new data types * @@ -215,14 +213,12 @@ typedef int xf86jmp_buf[1024]; /* xf86shmclt() */ #define XF86IPC_RMID 0 -#endif /* defined(XFree86LOADER) || defined(NEED_XF86_TYPES) */ - /* * the rest of this file should only be included for code that is supposed * to go into modules */ -#if defined(XFree86LOADER) && !defined(DONT_DEFINE_WRAPPERS) +#if !defined(DONT_DEFINE_WRAPPERS) #undef abort #define abort() xf86abort() @@ -713,10 +709,9 @@ typedef int xf86jmp_buf[1024]; # define _FILEDEFED /* Already have FILE defined, don't redefine it */ #endif -#endif /* XFree86LOADER && !DONT_DEFINE_WRAPPERS */ +#endif /* !DONT_DEFINE_WRAPPERS */ -#if defined(XFree86LOADER) && \ - (!defined(DONT_DEFINE_WRAPPERS) || defined(DEFINE_SETJMP_WRAPPERS)) +#if (!defined(DONT_DEFINE_WRAPPERS) || defined(DEFINE_SETJMP_WRAPPERS)) #undef setjmp #define setjmp(a) xf86setjmp_macro(a) #undef longjmp diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am index 0e7cc72b5..328ed197d 100644 --- a/hw/xfree86/rac/Makefile.am +++ b/hw/xfree86/rac/Makefile.am @@ -5,4 +5,4 @@ sdk_HEADERS = xf86RAC.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am index 136bc7c57..c9afdad60 100644 --- a/hw/xfree86/ramdac/Makefile.am +++ b/hw/xfree86/ramdac/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \ CURSOR.NOTES AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ - $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ + $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) xf86BitOrder.c: diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am index d473833ed..7e5671aa1 100644 --- a/hw/xfree86/scanpci/Makefile.am +++ b/hw/xfree86/scanpci/Makefile.am @@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) BUILT_SOURCES = xf86PciIds.h diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am index c373e8178..cb5ebb14a 100644 --- a/hw/xfree86/shadowfb/Makefile.am +++ b/hw/xfree86/shadowfb/Makefile.am @@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index 0705eb5bb..73e4042ae 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -33,7 +33,7 @@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser OPTIONSPATH=$(libdir)/X11 -xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \ +xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) \ $(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \ -DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\" xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \ diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index 92ca70485..847dbae70 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -36,9 +36,6 @@ #else -#ifndef XFree86LOADER -#define XFree86LOADER /* not really */ -#endif #define IN_LOADER #include "xf86.h" diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am index ec0b01fe1..dabfc3214 100644 --- a/hw/xfree86/utils/xorgconfig/Makefile.am +++ b/hw/xfree86/utils/xorgconfig/Makefile.am @@ -31,7 +31,7 @@ bin_PROGRAMS = xorgconfig X11dir = $(libdir)/X11 dist_X11_DATA = Cards -xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \ +xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \ -DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \ -DPROJECTROOT='"$(PROJECTROOT)"' \ -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \ diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am index 7da8f124b..02fdb4837 100644 --- a/hw/xfree86/vbe/Makefile.am +++ b/hw/xfree86/vbe/Makefile.am @@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c sdk_HEADERS = vbe.h vbeModes.h -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ -I$(srcdir)/../int10 diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am index 6c7fe1b28..2aa27fa41 100644 --- a/hw/xfree86/vgahw/Makefile.am +++ b/hw/xfree86/vgahw/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la libvgahw_la_LDFLAGS = -avoid-version libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) sdk_HEADERS = vgaHW.h diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am index 39f0155a6..23b7e16b1 100644 --- a/hw/xfree86/xaa/Makefile.am +++ b/hw/xfree86/xaa/Makefile.am @@ -68,4 +68,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am index b8e4c3d53..e7c873ae8 100644 --- a/hw/xfree86/xf1bpp/Makefile.am +++ b/hw/xfree86/xf1bpp/Makefile.am @@ -60,8 +60,7 @@ libxf1bppmfb_a_SOURCES = \ libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) -AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) \ - @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb mfbseg.c: diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am index 56b690f4b..7a9dc3a9c 100644 --- a/hw/xfree86/xf4bpp/Makefile.am +++ b/hw/xfree86/xf4bpp/Makefile.am @@ -59,4 +59,4 @@ mfbseg.c: INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am index 6538d1fab..5b30f45ed 100644 --- a/hw/xfree86/xf8_16bpp/Makefile.am +++ b/hw/xfree86/xf8_16bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h INCLUDES = $(XORG_INCS) -I$(top_srcdir)/fb -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) libxf8_16bpp_la_LDFLAGS = -avoid-version diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am index 1212fc0de..3050b81d1 100644 --- a/hw/xfree86/xf8_32bpp/Makefile.am +++ b/hw/xfree86/xf8_32bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_32.h INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) libxf8_32bpp_la_LDFLAGS = -avoid-version diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am index 0aa94f9a5..48a9825d2 100644 --- a/hw/xgl/Makefile.am +++ b/hw/xgl/Makefile.am @@ -19,7 +19,7 @@ SUBDIRS = \ $(XEGL_SUBDIRS) AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ -I$(top_srcdir)/GL/glx \ diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am index 701320de5..ded4a15e2 100644 --- a/hw/xgl/egl/Makefile.am +++ b/hw/xgl/egl/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS = \ $(XGL_MODULE_DIRS) AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XEGLMODULES_CFLAGS) diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am index 492921210..10a831f94 100644 --- a/hw/xgl/glx/Makefile.am +++ b/hw/xgl/glx/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/GL/include \ -I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/src/mesa/glapi \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XGLXMODULES_CFLAGS) diff --git a/hw/xgl/glxext/Makefile.am b/hw/xgl/glxext/Makefile.am index f9b9c0d68..c400f364a 100644 --- a/hw/xgl/glxext/Makefile.am +++ b/hw/xgl/glxext/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = module AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XGLMODULES_CFLAGS) \ diff --git a/hw/xgl/glxext/module/Makefile.am b/hw/xgl/glxext/module/Makefile.am index 660838dd9..82c4211d8 100644 --- a/hw/xgl/glxext/module/Makefile.am +++ b/hw/xgl/glxext/module/Makefile.am @@ -1,5 +1,5 @@ AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XGLMODULES_CFLAGS) \ diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index 67a2e981c..b23782eb9 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -52,7 +52,7 @@ Xnest_LDFLAGS = AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ -DNO_HW_ONLY_EXTS \ - @SERVER_DEFINES@ \ + \ $(XNESTMODULES_CFLAGS) EXTRA_DIST = os2Stub.c \ diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h index 8b477767a..4889f1fdd 100644 --- a/hw/xnest/xnest-config.h +++ b/hw/xnest/xnest-config.h @@ -32,6 +32,5 @@ #include #undef MITSHM -#undef XFree86LOADER #endif /* XNEST_CONFIG_H */ diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am index de0a1d94e..27a7e30d1 100644 --- a/hw/xprint/Makefile.am +++ b/hw/xprint/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = doc pcl pcl-mono raster ps etc config bin_PROGRAMS = Xprt -Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ +Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \ -DXPRINTDIR=\"$(libdir)/X11/xserver\" \ -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX diff --git a/hw/xprint/ps/Makefile.am b/hw/xprint/ps/Makefile.am index 90872d9da..0e8193743 100644 --- a/hw/xprint/ps/Makefile.am +++ b/hw/xprint/ps/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libps.la INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT libps_la_SOURCES = \ diff --git a/hw/xprint/raster/Makefile.am b/hw/xprint/raster/Makefile.am index fcd1e7334..bf5471df6 100644 --- a/hw/xprint/raster/Makefile.am +++ b/hw/xprint/raster/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libraster.la INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 libraster_la_SOURCES = \ diff --git a/include/misc.h b/include/misc.h index 5944a427f..199ad5da2 100644 --- a/include/misc.h +++ b/include/misc.h @@ -83,11 +83,7 @@ extern unsigned long serverGeneration; #include #include -#ifndef IN_MODULE -#ifndef NULL #include -#endif -#endif #ifndef MAXSCREENS #define MAXSCREENS 16 @@ -115,9 +111,7 @@ typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */ typedef struct _xReq *xReqPtr; #include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ -#ifndef IN_MODULE #include /* for bcopy, bzero, and bcmp */ -#endif #define NullBox ((BoxPtr)0) #define MILLI_PER_MIN (1000 * 60) @@ -145,12 +139,10 @@ typedef struct _xReq *xReqPtr; #define min(a, b) (((a) < (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b)) -#ifndef IN_MODULE /* abs() is a function, not a macro; include the file declaring * it in case we haven't done that yet. - */ + */ #include -#endif /* IN_MODULE */ #ifndef Fabs #define Fabs(a) ((a) > 0.0 ? (a) : -(a)) /* floating absolute value */ #endif @@ -166,7 +158,6 @@ typedef struct _xReq *xReqPtr; */ #define lowbit(x) ((x) & (~(x) + 1)) -#ifndef IN_MODULE /* XXX Not for modules */ #include #if !defined(MAXSHORT) || !defined(MINSHORT) || \ @@ -177,7 +168,6 @@ typedef struct _xReq *xReqPtr; */ #include -#endif #undef MAXSHORT #define MAXSHORT SHRT_MAX #undef MINSHORT @@ -189,7 +179,7 @@ typedef struct _xReq *xReqPtr; #include #include -#include /* for fopen, etc... */ +#include /* for fopen, etc... */ #endif diff --git a/include/os.h b/include/os.h index 0885bb298..e16839c74 100644 --- a/include/os.h +++ b/include/os.h @@ -88,12 +88,8 @@ typedef struct _NewClientRec *NewClientPtr; #define xnfstrdup(s) XNFstrdup(s) #endif -#ifndef IN_MODULE -#ifdef __SCO__ #include -#endif -#include -#endif +#include /* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */ #ifdef SIGNALRETURNSINT @@ -517,10 +513,4 @@ extern void ErrorF(const char *f, ...) _printf_attribute(1,2); extern void Error(char *str); extern void LogPrintMarkers(void); -#if defined(NEED_SNPRINTF) && !defined(IN_MODULE) -extern int snprintf(char *str, size_t size, const char *format, ...) - _printf_attribute(3,4); -extern int vsnprintf(char *str, size_t size, const char *format, va_list ap); -#endif - #endif /* OS_H */ diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index f31d98a77..48196d8b6 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -235,4 +235,7 @@ /* System has wscons console */ #undef WSCONS_SUPPORT +/* Loadable XFree86 server awesomeness */ +#undef XFree86LOADER + #endif /* _XORG_SERVER_H_ */ diff --git a/mfb/Makefile.am b/mfb/Makefile.am index f72867e22..fe0bb1c26 100644 --- a/mfb/Makefile.am +++ b/mfb/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libmfb.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support diff --git a/mfb/maskbits.h b/mfb/maskbits.h index ed5cc2687..d5e1eba58 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -253,7 +253,7 @@ extern PixelType mfbGetmask(int); #define BitLeft(b,s) SCRLEFT(b,s) #define BitRight(b,s) SCRRIGHT(b,s) -#ifdef XFree86Server +#if 1 #define LONG2CHARSSAMEORDER(x) ((MfbBits)(x)) #define LONG2CHARSDIFFORDER( x ) ( ( ( ( x ) & (MfbBits)0x000000FF ) << 0x18 ) \ | ( ( ( x ) & (MfbBits)0x0000FF00 ) << 0x08 ) \ diff --git a/mi/Makefile.am b/mi/Makefile.am index c77eac709..42f75ae73 100644 --- a/mi/Makefile.am +++ b/mi/Makefile.am @@ -6,7 +6,7 @@ sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ mispans.h miwideline.h mistruct.h mifpoly.h endif -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) # libminimi is for dmx - it has different defines for miinitext.c libminimi_la_SOURCES = \ diff --git a/mi/mibitblt.c b/mi/mibitblt.c index b7fb4cc5d..2bccc2fb4 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -360,7 +360,7 @@ miGetPlane( * Now get the bit and insert into a bitmap in XY format. */ bit = (pixel >> planeNum) & 1; -#ifndef XFree86Server +#if 0 /* XXX assuming bit order == byte order */ #if BITMAP_BIT_ORDER == LSBFirst bit <<= k; diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 9cdb09af9..d83d2fc6a 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -95,7 +95,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) Bool fInBox; DDXPointRec pt[NPT], ptThisLine; int width[NPT]; -#ifdef XFree86Server +#if 1 PixelType startmask; if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) @@ -135,7 +135,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) while(pw < pwEnd) { w = *pw; -#ifdef XFree86Server +#if 1 msk = startmask; #else msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1); @@ -168,7 +168,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) fInBox = FALSE; } } -#ifdef XFree86Server +#if 1 /* This is not quite right, but it'll do for now */ if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) @@ -191,7 +191,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) { /* Process final partial word on line */ w = *pw; -#ifdef XFree86Server +#if 1 msk = startmask; #else msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1); @@ -224,7 +224,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) fInBox = FALSE; } } -#ifdef XFree86Server +#if 1 /* This is not quite right, but it'll do for now */ if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) diff --git a/mi/miwideline.c b/mi/miwideline.c index 33170a305..3554e3e8e 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -2072,7 +2072,7 @@ miWideDash (pDrawable, pGC, mode, npt, pPts) Bool endIsFg = FALSE, startIsFg = FALSE; Bool firstIsFg = FALSE, prevIsFg = FALSE; -#ifndef XFree86Server +#if 0 /* XXX backward compatibility */ if (pGC->lineWidth == 0) { diff --git a/miext/cw/Makefile.am b/miext/cw/Makefile.am index 9b8e2c25e..e056f4279 100644 --- a/miext/cw/Makefile.am +++ b/miext/cw/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libcw.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am index 2af9ac2e2..595835731 100644 --- a/miext/damage/Makefile.am +++ b/miext/damage/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdamage.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support diff --git a/miext/damage/damage.c b/miext/damage/damage.c index ef7bca455..2e80011ac 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1770,7 +1770,6 @@ DamageSetup (ScreenPtr pScreen) if (!pScrPriv) return FALSE; -#ifdef XFree86Server #ifdef COMPOSITE /* This is a kludge to ensure wrapping order with the composite wrapper. * If it's done from compinit.c, then DamageSetup may be called before the @@ -1779,7 +1778,6 @@ DamageSetup (ScreenPtr pScreen) */ if (!noCompositeExtension) miInitializeCompositeWrapper (pScreen); -#endif #endif pScrPriv->internalLevel = 0; diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am index 1426c033e..a73d0ec78 100644 --- a/miext/shadow/Makefile.am +++ b/miext/shadow/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libshadow.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support diff --git a/os/Makefile.am b/os/Makefile.am index d7fd58d28..71e24c086 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libos.la libcwrapper.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) # FIXME: Add support for these in configure.ac K5AUTH_SOURCES = k5auth.c diff --git a/os/utils.c b/os/utils.c index e41c3664b..de3e7c9ec 100644 --- a/os/utils.c +++ b/os/utils.c @@ -139,13 +139,9 @@ _X_EXPORT Bool noTestExtensions; _X_EXPORT Bool noBigReqExtension = FALSE; #endif #ifdef COMPOSITE - #ifdef XFree86Server - /* COMPOSITE is disabled by default for now until the - * interface is stable */ - #define COMPOSITE_DEFAULT FALSE - #else - #define COMPOSITE_DEFAULT TRUE - #endif + /* COMPOSITE is disabled by default for now until the + * interface is stable */ + #define COMPOSITE_DEFAULT FALSE _X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT; #endif diff --git a/randr/Makefile.am b/randr/Makefile.am index 753eebb54..bd30aed8a 100644 --- a/randr/Makefile.am +++ b/randr/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = librandr.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) if XORG sdk_HEADERS = randrstr.h diff --git a/record/Makefile.am b/record/Makefile.am index 9bb2f7a20..2a64f3189 100644 --- a/record/Makefile.am +++ b/record/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = librecord.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) librecord_la_SOURCES = record.c set.c diff --git a/render/Makefile.am b/render/Makefile.am index addabc67a..830778a92 100644 --- a/render/Makefile.am +++ b/render/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = librender.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) librender_la_SOURCES = \ animcur.c \ diff --git a/xfixes/Makefile.am b/xfixes/Makefile.am index a9ba7623a..2a95c065b 100644 --- a/xfixes/Makefile.am +++ b/xfixes/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libxfixes.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) libxfixes_la_SOURCES = \ cursor.c \ diff --git a/xkb/Makefile.am b/xkb/Makefile.am index 1669d882b..5763ce8be 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \ +AM_CFLAGS = $(DIX_CFLAGS) \ -DHAVE_XKB_CONFIG_H DDX_SRCS = \ diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index e4f74fb76..20277224e 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -1000,7 +1000,6 @@ _XkbFilterSwitchScreen( XkbSrvInfoPtr xkbi, return 1; } -#ifdef XFree86Server static int _XkbFilterXF86Private( XkbSrvInfoPtr xkbi, XkbFilterPtr filter, @@ -1022,7 +1021,6 @@ _XkbFilterXF86Private( XkbSrvInfoPtr xkbi, } return 1; } -#endif #ifdef XINPUT @@ -1252,12 +1250,10 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev); sendEvent= _XkbFilterDeviceBtn(xkbi,filter,key,&act); break; #endif -#ifdef XFree86Server case XkbSA_XFree86Private: filter = _XkbNextFreeFilter(); sendEvent= _XkbFilterXF86Private(xkbi,filter,key,&act); break; -#endif } } } diff --git a/xorg-server.pc.in b/xorg-server.pc.in index 04206e4dc..7b4b2fb24 100644 --- a/xorg-server.pc.in +++ b/xorg-server.pc.in @@ -8,5 +8,5 @@ sdkdir=@sdkdir@ Name: xorg-server Description: Modular X.Org X Server Version: @PACKAGE_VERSION@ -Cflags: -I${sdkdir} @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +Cflags: -I${sdkdir} Libs: -L${libdir} -- cgit v1.2.3 From 0aaac95b0d12089b256c97f6ff955c8c229ae095 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 21 Jul 2006 17:56:00 -0400 Subject: Remove RCS tags. Fix Xprint makefile braindamage. --- GL/apple/aglGlx.c | 1 - GL/apple/indirect.c | 1 - GL/glx/g_disptab.c | 1 - GL/glx/g_disptab.h | 1 - GL/glx/g_disptab_EXT.c | 1 - GL/glx/g_disptab_EXT.h | 1 - GL/glx/glxcmds.c | 1 - GL/glx/glxcmdsswap.c | 1 - GL/glx/glxcontext.h | 1 - GL/glx/glxdrawable.h | 1 - GL/glx/glxext.c | 1 - GL/glx/glxext.h | 1 - GL/glx/glxscreens.c | 1 - GL/glx/glxscreens.h | 1 - GL/glx/glxserver.h | 1 - GL/glx/glxutil.c | 1 - GL/glx/glxutil.h | 1 - GL/glx/render2.c | 1 - GL/glx/render2swap.c | 1 - GL/glx/rensize.c | 1 - GL/glx/rensizetab.c | 1 - GL/glx/single2.c | 1 - GL/glx/single2swap.c | 1 - GL/glx/singlepixswap.c | 1 - GL/glx/singlesize.c | 1 - GL/glx/unpack.h | 1 - GL/mesa/X/xf86glx.c | 1 - GL/mesa/X/xf86glx_util.c | 1 - GL/mesa/X/xf86glx_util.h | 1 - GL/mesa/X/xf86glxint.h | 1 - XTrap/xtrapddmi.c | 1 - XTrap/xtrapdi.c | 2 -- Xext/EVI.c | 2 -- Xext/EVIstruct.h | 2 -- Xext/appgroup.c | 2 -- Xext/bigreq.c | 2 -- Xext/cup.c | 2 -- Xext/dpms.c | 2 -- Xext/dpmsproc.h | 1 - Xext/dpmsstubs.c | 2 -- Xext/fontcache.c | 1 - Xext/mbuf.c | 2 -- Xext/mbufbf.c | 2 -- Xext/mbufpx.c | 2 -- Xext/mitmisc.c | 2 -- Xext/panoramiX.c | 2 -- Xext/panoramiX.h | 2 -- Xext/panoramiXSwap.c | 2 -- Xext/panoramiXh.h | 1 - Xext/panoramiXprocs.c | 2 -- Xext/panoramiXsrv.h | 1 - Xext/sampleEVI.c | 1 - Xext/saver.c | 3 --- Xext/security.c | 3 --- Xext/shape.c | 3 --- Xext/shm.c | 2 -- Xext/sleepuntil.c | 2 -- Xext/sleepuntil.h | 1 - Xext/sync.c | 2 -- Xext/xcmisc.c | 2 -- Xext/xevie.c | 1 - Xext/xf86bigfont.c | 1 - Xext/xprint.c | 2 -- Xext/xres.c | 2 -- Xext/xtest.c | 3 --- Xext/xvdisp.c | 2 -- Xext/xvdix.h | 1 - Xext/xvmain.c | 2 -- Xext/xvmc.c | 1 - Xext/xvmcext.h | 1 - afb/afb.h | 2 -- afb/afbbitblt.c | 2 -- afb/afbblt.c | 2 -- afb/afbbres.c | 1 - afb/afbbresd.c | 1 - afb/afbbstore.c | 1 - afb/afbclip.c | 2 -- afb/afbcmap.c | 2 -- afb/afbfillarc.c | 2 -- afb/afbfillrct.c | 2 -- afb/afbfillsp.c | 2 -- afb/afbfont.c | 1 - afb/afbgc.c | 2 -- afb/afbgetsp.c | 2 -- afb/afbhrzvert.c | 2 -- afb/afbimage.c | 1 - afb/afbimggblt.c | 2 -- afb/afbline.c | 2 -- afb/afbmisc.c | 1 - afb/afbpixmap.c | 2 -- afb/afbply1rct.c | 2 -- afb/afbplygblt.c | 2 -- afb/afbpntarea.c | 2 -- afb/afbpntwin.c | 1 - afb/afbpolypnt.c | 2 -- afb/afbpushpxl.c | 2 -- afb/afbscrinit.c | 2 -- afb/afbsetsp.c | 2 -- afb/afbtegblt.c | 2 -- afb/afbtile.c | 2 -- afb/afbwindow.c | 2 -- afb/afbzerarc.c | 2 -- cfb/cfb.h | 2 -- cfb/cfb16.h | 1 - cfb/cfb24.h | 1 - cfb/cfb32.h | 1 - cfb/cfb8bit.c | 2 -- cfb/cfb8bit.h | 2 -- cfb/cfb8line.c | 2 -- cfb/cfballpriv.c | 2 -- cfb/cfbbitblt.c | 2 -- cfb/cfbblt.c | 2 -- cfb/cfbbres.c | 2 -- cfb/cfbbresd.c | 2 -- cfb/cfbbstore.c | 2 -- cfb/cfbcmap.c | 2 -- cfb/cfbcppl.c | 1 - cfb/cfbfillarc.c | 2 -- cfb/cfbfillrct.c | 2 -- cfb/cfbfillsp.c | 2 -- cfb/cfbgc.c | 2 -- cfb/cfbgetsp.c | 2 -- cfb/cfbglblt8.c | 2 -- cfb/cfbhrzvert.c | 2 -- cfb/cfbigblt8.c | 2 -- cfb/cfbimage.c | 2 -- cfb/cfbline.c | 2 -- cfb/cfbmap.h | 2 -- cfb/cfbmskbits.c | 2 -- cfb/cfbmskbits.h | 2 -- cfb/cfbpixmap.c | 2 -- cfb/cfbply1rct.c | 2 -- cfb/cfbpntwin.c | 3 --- cfb/cfbpolypnt.c | 2 -- cfb/cfbpush8.c | 2 -- cfb/cfbrctstp8.c | 2 -- cfb/cfbrrop.c | 2 -- cfb/cfbrrop.h | 2 -- cfb/cfbscrinit.c | 2 -- cfb/cfbsetsp.c | 2 -- cfb/cfbsolid.c | 2 -- cfb/cfbteblt8.c | 2 -- cfb/cfbtegblt.c | 2 -- cfb/cfbtile32.c | 2 -- cfb/cfbtileodd.c | 2 -- cfb/cfbunmap.h | 1 - cfb/cfbwindow.c | 2 -- cfb/cfbzerarc.c | 2 -- cfb/stip68kgnu.h | 2 -- dbe/dbe.c | 3 --- dbe/dbestruct.h | 1 - dbe/midbe.c | 2 -- dbe/midbe.h | 1 - dbe/midbestr.h | 1 - dix/atom.c | 2 -- dix/colormap.c | 3 --- dix/cursor.c | 2 -- dix/devices.c | 3 --- dix/dispatch.c | 3 --- dix/dispatch.h | 1 - dix/dixfonts.c | 3 --- dix/dixutils.c | 2 -- dix/events.c | 3 --- dix/extension.c | 2 -- dix/ffs.c | 1 - dix/gc.c | 2 -- dix/globals.c | 3 --- dix/glyphcurs.c | 1 - dix/grabs.c | 2 -- dix/main.c | 3 --- dix/pixmap.c | 2 -- dix/privates.c | 3 --- dix/property.c | 2 -- dix/resource.c | 3 --- dix/strcasecmp.c | 2 -- dix/swaprep.c | 2 -- dix/swapreq.c | 2 -- dix/tables.c | 2 -- dix/window.c | 3 --- dix/xpstubs.c | 1 - fb/fb.h | 2 -- fb/fb24_32.c | 1 - fb/fballpriv.c | 1 - fb/fbarc.c | 1 - fb/fbbits.c | 1 - fb/fbblt.c | 1 - fb/fbbltone.c | 1 - fb/fbbstore.c | 1 - fb/fbcmap.c | 2 -- fb/fbcompose.c | 2 -- fb/fbcopy.c | 1 - fb/fbfill.c | 1 - fb/fbfillrect.c | 1 - fb/fbfillsp.c | 1 - fb/fbgc.c | 2 -- fb/fbgetsp.c | 1 - fb/fbglyph.c | 2 -- fb/fbimage.c | 1 - fb/fboverlay.c | 2 -- fb/fboverlay.h | 1 - fb/fbpict.c | 1 - fb/fbpict.h | 1 - fb/fbpixmap.c | 1 - fb/fbpoint.c | 1 - fb/fbpush.c | 1 - fb/fbrop.h | 1 - fb/fbscreen.c | 5 +---- fb/fbseg.c | 1 - fb/fbsetsp.c | 1 - fb/fbstipple.c | 1 - fb/fbtile.c | 1 - fb/fbutil.c | 1 - fb/fbwindow.c | 2 -- hw/darwin/darwin.c | 2 -- hw/darwin/darwin.h | 1 - hw/darwin/darwinClut8.h | 1 - hw/darwin/darwinEvents.c | 1 - hw/darwin/darwinKeyboard.c | 1 - hw/darwin/darwinKeyboard.h | 1 - hw/darwin/darwinXinput.c | 2 -- hw/darwin/iokit/xfIOKit.c | 2 -- hw/darwin/iokit/xfIOKit.h | 1 - hw/darwin/iokit/xfIOKitCursor.c | 1 - hw/darwin/iokit/xfIOKitStartup.c | 1 - hw/darwin/quartz/Preferences.h | 1 - hw/darwin/quartz/XDarwinStartup.c | 1 - hw/darwin/quartz/XServer.h | 2 -- hw/darwin/quartz/applewm.c | 1 - hw/darwin/quartz/applewmExt.h | 1 - hw/darwin/quartz/cr/XView.h | 1 - hw/darwin/quartz/fullscreen/fullscreen.c | 2 -- hw/darwin/quartz/fullscreen/quartzCursor.c | 1 - hw/darwin/quartz/fullscreen/quartzCursor.h | 1 - hw/darwin/quartz/pseudoramiX.c | 1 - hw/darwin/quartz/pseudoramiX.h | 1 - hw/darwin/quartz/quartz.c | 2 -- hw/darwin/quartz/quartz.h | 2 -- hw/darwin/quartz/quartzAudio.c | 1 - hw/darwin/quartz/quartzAudio.h | 1 - hw/darwin/quartz/quartzCommon.h | 2 -- hw/darwin/quartz/quartzCursor.c | 1 - hw/darwin/quartz/quartzCursor.h | 1 - hw/darwin/quartz/quartzKeyboard.c | 1 - hw/darwin/quartz/quartzPasteboard.c | 1 - hw/darwin/quartz/quartzPasteboard.h | 3 +-- hw/darwin/quartz/quartzStartup.c | 3 +-- hw/darwin/quartz/xpr/Xplugin.h | 1 - hw/darwin/quartz/xpr/appledri.c | 1 - hw/darwin/quartz/xpr/dri.c | 1 - hw/darwin/quartz/xpr/dri.h | 1 - hw/darwin/quartz/xpr/dristruct.h | 1 - hw/darwin/quartz/xpr/x-hash.c | 1 - hw/darwin/quartz/xpr/x-hash.h | 1 - hw/darwin/quartz/xpr/x-list.c | 1 - hw/darwin/quartz/xpr/x-list.h | 1 - hw/darwin/quartz/xpr/xpr.h | 2 -- hw/darwin/quartz/xpr/xprAppleWM.c | 1 - hw/darwin/quartz/xpr/xprCursor.c | 1 - hw/darwin/quartz/xpr/xprFrame.c | 2 -- hw/darwin/quartz/xpr/xprScreen.c | 2 -- hw/darwin/utils/dumpkeymap.c | 1 - hw/dmx/glxProxy/compsize.c | 1 - hw/dmx/glxProxy/g_disptab.c | 1 - hw/dmx/glxProxy/g_disptab.h | 1 - hw/dmx/glxProxy/global.c | 1 - hw/dmx/glxProxy/glxcmds.c | 1 - hw/dmx/glxProxy/glxcmdsswap.c | 1 - hw/dmx/glxProxy/glxcontext.h | 1 - hw/dmx/glxProxy/glxdrawable.h | 1 - hw/dmx/glxProxy/glxerror.h | 1 - hw/dmx/glxProxy/glxext.c | 1 - hw/dmx/glxProxy/glxext.h | 1 - hw/dmx/glxProxy/glxscreens.c | 1 - hw/dmx/glxProxy/glxscreens.h | 1 - hw/dmx/glxProxy/glxserver.h | 1 - hw/dmx/glxProxy/glxsingle.c | 1 - hw/dmx/glxProxy/glxutil.c | 1 - hw/dmx/glxProxy/glxutil.h | 1 - hw/dmx/glxProxy/glxvendor.c | 1 - hw/dmx/glxProxy/render2swap.c | 1 - hw/dmx/glxProxy/renderpixswap.c | 1 - hw/dmx/glxProxy/unpack.h | 1 - hw/dmx/input/dmxeq.c | 1 - hw/kdrive/ati/ati_dripriv.h | 1 - hw/kdrive/ati/r128_common.h | 1 - hw/kdrive/ati/r128_sarea.h | 1 - hw/kdrive/ati/radeon_common.h | 1 - hw/kdrive/ati/radeon_sarea.h | 1 - hw/kdrive/pm2/glint_regs.h | 1 - hw/kdrive/sis300/sis_reg.h | 1 - hw/kdrive/smi/smi.c | 1 - hw/kdrive/smi/smi.h | 1 - hw/kdrive/smi/smidraw.c | 1 - hw/kdrive/smi/smidraw.h | 1 - hw/kdrive/smi/smistub.c | 1 - hw/kdrive/smi/smivideo.c | 1 - hw/kdrive/src/fourcc.h | 1 - hw/vfb/InitInput.c | 2 -- hw/vfb/InitOutput.c | 2 -- hw/vfb/lk201kbd.h | 1 - hw/xfree86/common/atKeynames.h | 1 - hw/xfree86/common/compiler.h | 1 - hw/xfree86/common/fourcc.h | 1 - hw/xfree86/common/scoasm.h | 1 - hw/xfree86/common/xf86.h | 1 - hw/xfree86/common/xf86AutoConfig.c | 1 - hw/xfree86/common/xf86Bus.h | 1 - hw/xfree86/common/xf86Config.c | 2 -- hw/xfree86/common/xf86Config.h | 1 - hw/xfree86/common/xf86Configure.c | 1 - hw/xfree86/common/xf86Cursor.c | 1 - hw/xfree86/common/xf86DGA.c | 2 -- hw/xfree86/common/xf86DPMS.c | 2 -- hw/xfree86/common/xf86Date.h | 2 -- hw/xfree86/common/xf86Debug.c | 1 - hw/xfree86/common/xf86DoProbe.c | 1 - hw/xfree86/common/xf86DoScanPci.c | 1 - hw/xfree86/common/xf86Globals.c | 1 - hw/xfree86/common/xf86Helper.c | 1 - hw/xfree86/common/xf86InPriv.h | 1 - hw/xfree86/common/xf86Init.c | 2 -- hw/xfree86/common/xf86Io.c | 2 -- hw/xfree86/common/xf86Kbd.c | 1 - hw/xfree86/common/xf86KbdBSD.c | 1 - hw/xfree86/common/xf86KbdLnx.c | 1 - hw/xfree86/common/xf86KbdMach.c | 1 - hw/xfree86/common/xf86Keymap.h | 1 - hw/xfree86/common/xf86MiscExt.c | 1 - hw/xfree86/common/xf86Mode.c | 2 -- hw/xfree86/common/xf86Module.h | 1 - hw/xfree86/common/xf86Opt.h | 1 - hw/xfree86/common/xf86Option.c | 1 - hw/xfree86/common/xf86PM.c | 1 - hw/xfree86/common/xf86PciInfo.h | 1 - hw/xfree86/common/xf86Priv.h | 1 - hw/xfree86/common/xf86Privstr.h | 1 - hw/xfree86/common/xf86RandR.c | 2 -- hw/xfree86/common/xf86Resources.h | 1 - hw/xfree86/common/xf86Version.h | 3 --- hw/xfree86/common/xf86Versions.c | 1 - hw/xfree86/common/xf86VidMode.c | 1 - hw/xfree86/common/xf86XKB.c | 1 - hw/xfree86/common/xf86Xinput.c | 2 -- hw/xfree86/common/xf86Xinput.h | 1 - hw/xfree86/common/xf86cmap.c | 2 -- hw/xfree86/common/xf86cmap.h | 1 - hw/xfree86/common/xf86fbBus.c | 1 - hw/xfree86/common/xf86fbman.c | 1 - hw/xfree86/common/xf86fbman.h | 1 - hw/xfree86/common/xf86isaBus.c | 1 - hw/xfree86/common/xf86noBus.c | 1 - hw/xfree86/common/xf86pciBus.c | 1 - hw/xfree86/common/xf86pciBus.h | 1 - hw/xfree86/common/xf86sbusBus.c | 1 - hw/xfree86/common/xf86sbusBus.h | 1 - hw/xfree86/common/xf86str.h | 1 - hw/xfree86/common/xf86xv.c | 1 - hw/xfree86/common/xf86xv.h | 1 - hw/xfree86/common/xf86xvmc.c | 1 - hw/xfree86/common/xf86xvmc.h | 1 - hw/xfree86/common/xf86xvpriv.h | 1 - hw/xfree86/common/xisb.c | 1 - hw/xfree86/common/xorgHelper.c | 1 - hw/xfree86/common/xorgVersion.h | 2 -- hw/xfree86/ddc/ddcProperty.c | 1 - hw/xfree86/ddc/edid.c | 1 - hw/xfree86/ddc/edid.h | 1 - hw/xfree86/ddc/interpret_edid.c | 1 - hw/xfree86/ddc/interpret_vdif.c | 1 - hw/xfree86/ddc/print_edid.c | 1 - hw/xfree86/ddc/print_vdif.c | 1 - hw/xfree86/ddc/vdif.h | 1 - hw/xfree86/ddc/xf86DDC.h | 1 - hw/xfree86/dixmods/extmod/dgaproc.h | 1 - hw/xfree86/dixmods/extmod/modinit.h | 2 -- hw/xfree86/dixmods/extmod/vidmodeproc.h | 1 - hw/xfree86/dixmods/extmod/xf86dga.c | 1 - hw/xfree86/dixmods/extmod/xf86dga2.c | 1 - hw/xfree86/dixmods/extmod/xf86misc.c | 1 - hw/xfree86/dixmods/extmod/xf86miscproc.h | 1 - hw/xfree86/dixmods/extmod/xf86vmode.c | 3 --- hw/xfree86/dixmods/extmod/xvmod.c | 1 - hw/xfree86/dixmods/extmod/xvmodproc.h | 1 - hw/xfree86/dixmods/xkbKillSrv.c | 2 -- hw/xfree86/dixmods/xkbPrivate.c | 1 - hw/xfree86/dixmods/xkbVT.c | 2 -- hw/xfree86/dri/dri.c | 1 - hw/xfree86/dri/dri.h | 1 - hw/xfree86/dri/dristruct.h | 1 - hw/xfree86/dri/sarea.h | 2 -- hw/xfree86/dri/xf86dri.c | 1 - hw/xfree86/dummylib/dummylib.h | 1 - hw/xfree86/dummylib/getvalidbios.c | 1 - hw/xfree86/dummylib/logvwrite.c | 1 - hw/xfree86/dummylib/xalloc.c | 1 - hw/xfree86/dummylib/xf86addrestolist.c | 1 - hw/xfree86/dummylib/xf86drvmsg.c | 1 - hw/xfree86/dummylib/xf86drvmsgverb.c | 1 - hw/xfree86/dummylib/xf86errorf.c | 1 - hw/xfree86/dummylib/xf86errorfverb.c | 1 - hw/xfree86/dummylib/xf86msg.c | 1 - hw/xfree86/dummylib/xf86msgverb.c | 1 - hw/xfree86/dummylib/xf86opt.c | 1 - hw/xfree86/fbdevhw/fbdevhw.h | 1 - hw/xfree86/fbdevhw/fbdevhwstub.c | 1 - hw/xfree86/fbdevhw/fbpriv.h | 1 - hw/xfree86/i2c/fi1236.c | 1 - hw/xfree86/i2c/xf86i2c.c | 1 - hw/xfree86/i2c/xf86i2c.h | 1 - hw/xfree86/int10/generic.c | 1 - hw/xfree86/int10/helper_exec.c | 1 - hw/xfree86/int10/helper_mem.c | 1 - hw/xfree86/int10/pci.c | 1 - hw/xfree86/int10/stub.c | 1 - hw/xfree86/int10/xf86int10.c | 1 - hw/xfree86/int10/xf86int10.h | 1 - hw/xfree86/int10/xf86x86emu.c | 1 - hw/xfree86/int10/xf86x86emu.h | 1 - hw/xfree86/os-support/assyntax.h | 1 - hw/xfree86/os-support/bsd/alpha_video.c | 1 - hw/xfree86/os-support/bsd/arm_video.c | 1 - hw/xfree86/os-support/bsd/bsdResource.c | 1 - hw/xfree86/os-support/bsd/bsd_VTsw.c | 1 - hw/xfree86/os-support/bsd/bsd_axp.c | 1 - hw/xfree86/os-support/bsd/bsd_ev56.c | 1 - hw/xfree86/os-support/bsd/bsd_init.c | 1 - hw/xfree86/os-support/bsd/bsd_io.c | 1 - hw/xfree86/os-support/bsd/bsd_jstk.c | 1 - hw/xfree86/os-support/bsd/bsd_kbd.c | 1 - hw/xfree86/os-support/bsd/bsd_kbd.h | 1 - hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 1 - hw/xfree86/os-support/bsd/bsd_mouse.c | 1 - hw/xfree86/os-support/bsd/i386_video.c | 1 - hw/xfree86/os-support/bsd/libusb/data.c | 1 - hw/xfree86/os-support/bsd/libusb/descr.c | 1 - hw/xfree86/os-support/bsd/libusb/parse.c | 1 - hw/xfree86/os-support/bsd/libusb/usage.c | 1 - hw/xfree86/os-support/bsd/libusb/usb.h | 1 - hw/xfree86/os-support/bsd/libusb/usbvar.h | 1 - hw/xfree86/os-support/bsd/ppc_video.c | 1 - hw/xfree86/os-support/bsd/sparc64_video.c | 1 - hw/xfree86/os-support/bus/460gxPCI.c | 1 - hw/xfree86/os-support/bus/460gxPCI.h | 1 - hw/xfree86/os-support/bus/Pci.c | 1 - hw/xfree86/os-support/bus/Pci.h | 1 - hw/xfree86/os-support/bus/Sbus.c | 1 - hw/xfree86/os-support/bus/axpPci.c | 1 - hw/xfree86/os-support/bus/e8870PCI.c | 1 - hw/xfree86/os-support/bus/e8870PCI.h | 1 - hw/xfree86/os-support/bus/freebsdPci.c | 1 - hw/xfree86/os-support/bus/ix86Pci.c | 1 - hw/xfree86/os-support/bus/linuxPci.c | 1 - hw/xfree86/os-support/bus/netbsdPci.c | 1 - hw/xfree86/os-support/bus/ppcPci.c | 1 - hw/xfree86/os-support/bus/sparcPci.c | 1 - hw/xfree86/os-support/bus/xf86Pci.h | 1 - hw/xfree86/os-support/bus/xf86Sbus.h | 1 - hw/xfree86/os-support/bus/zx1PCI.c | 1 - hw/xfree86/os-support/bus/zx1PCI.h | 1 - hw/xfree86/os-support/drm/xf86drm.c | 1 - hw/xfree86/os-support/drm/xf86drmHash.c | 1 - hw/xfree86/os-support/drm/xf86drmRandom.c | 1 - hw/xfree86/os-support/drm/xf86drmSL.c | 1 - hw/xfree86/os-support/int10Defines.h | 1 - hw/xfree86/os-support/linux/int10/linux.c | 1 - hw/xfree86/os-support/linux/lnx.h | 1 - hw/xfree86/os-support/linux/lnxResource.c | 1 - hw/xfree86/os-support/linux/lnx_agp.c | 1 - hw/xfree86/os-support/linux/lnx_apm.c | 1 - hw/xfree86/os-support/linux/lnx_axp.c | 1 - hw/xfree86/os-support/linux/lnx_ev56.c | 1 - hw/xfree86/os-support/linux/lnx_init.c | 2 -- hw/xfree86/os-support/linux/lnx_io.c | 1 - hw/xfree86/os-support/linux/lnx_jstk.c | 1 - hw/xfree86/os-support/linux/lnx_kbd.c | 1 - hw/xfree86/os-support/linux/lnx_kbd.h | 1 - hw/xfree86/os-support/linux/lnx_kmod.c | 1 - hw/xfree86/os-support/linux/lnx_mouse.c | 1 - hw/xfree86/os-support/linux/lnx_pci.c | 1 - hw/xfree86/os-support/linux/lnx_video.c | 2 -- hw/xfree86/os-support/lynxos/lynx_init.c | 1 - hw/xfree86/os-support/lynxos/lynx_io.c | 1 - hw/xfree86/os-support/lynxos/lynx_mmap.c | 1 - hw/xfree86/os-support/lynxos/lynx_mouse.c | 1 - hw/xfree86/os-support/lynxos/lynx_noinline.c | 1 - hw/xfree86/os-support/lynxos/lynx_ppc.c | 1 - hw/xfree86/os-support/lynxos/lynx_video.c | 1 - hw/xfree86/os-support/misc/BUSmemcpy.c | 1 - hw/xfree86/os-support/misc/Delay.c | 1 - hw/xfree86/os-support/misc/IODelay.c | 1 - hw/xfree86/os-support/misc/SlowBcopy.c | 1 - hw/xfree86/os-support/misc/xf86_IlHack.c | 1 - hw/xfree86/os-support/misc/xf86_Util.c | 1 - hw/xfree86/os-support/sco/VTsw_sco.c | 1 - hw/xfree86/os-support/sco/sco_init.c | 1 - hw/xfree86/os-support/sco/sco_io.c | 1 - hw/xfree86/os-support/sco/sco_mouse.c | 1 - hw/xfree86/os-support/sco/sco_video.c | 1 - hw/xfree86/os-support/shared/VTsw_noop.c | 1 - hw/xfree86/os-support/shared/VTsw_usl.c | 1 - hw/xfree86/os-support/shared/agp_noop.c | 1 - hw/xfree86/os-support/shared/at_scancode.c | 1 - hw/xfree86/os-support/shared/bios_devmem.c | 1 - hw/xfree86/os-support/shared/bios_mmap.c | 1 - hw/xfree86/os-support/shared/ia64Pci.c | 1 - hw/xfree86/os-support/shared/ioperm_noop.c | 1 - hw/xfree86/os-support/shared/kbd.c | 1 - hw/xfree86/os-support/shared/kmod_noop.c | 1 - hw/xfree86/os-support/shared/libc_wrapper.c | 1 - hw/xfree86/os-support/shared/pm_noop.c | 1 - hw/xfree86/os-support/shared/posix_tty.c | 1 - hw/xfree86/os-support/shared/sigio.c | 1 - hw/xfree86/os-support/shared/sigiostubs.c | 2 -- hw/xfree86/os-support/shared/stdPci.c | 1 - hw/xfree86/os-support/shared/stdResource.c | 1 - hw/xfree86/os-support/shared/std_kbdEv.c | 1 - hw/xfree86/os-support/shared/sysv_kbd.c | 1 - hw/xfree86/os-support/shared/vidmem.c | 1 - hw/xfree86/os-support/shared/xf86Axp.c | 1 - hw/xfree86/os-support/solaris/agpgart.h | 1 - hw/xfree86/os-support/solaris/sun_agp.c | 1 - hw/xfree86/os-support/solaris/sun_bios.c | 1 - hw/xfree86/os-support/solaris/sun_init.c | 2 -- hw/xfree86/os-support/solaris/sun_io.c | 1 - hw/xfree86/os-support/solaris/sun_kbd.c | 2 -- hw/xfree86/os-support/solaris/sun_kbdEv.c | 2 -- hw/xfree86/os-support/solaris/sun_mouse.c | 2 -- hw/xfree86/os-support/solaris/sun_vid.c | 1 - hw/xfree86/os-support/sysv/sysv_init.c | 1 - hw/xfree86/os-support/sysv/sysv_io.c | 1 - hw/xfree86/os-support/sysv/sysv_mouse.c | 1 - hw/xfree86/os-support/sysv/sysv_video.c | 1 - hw/xfree86/os-support/sysv/xqueue.c | 1 - hw/xfree86/os-support/usl/usl_io.c | 1 - hw/xfree86/os-support/usl/usl_iop.c | 1 - hw/xfree86/os-support/usl/usl_kbd.c | 1 - hw/xfree86/os-support/usl/usl_mouse.c | 1 - hw/xfree86/os-support/xf86OSKbd.h | 1 - hw/xfree86/os-support/xf86OSmouse.h | 1 - hw/xfree86/os-support/xf86OSpriv.h | 1 - hw/xfree86/os-support/xf86_OSlib.h | 2 -- hw/xfree86/os-support/xf86_OSproc.h | 1 - hw/xfree86/os-support/xf86_ansic.h | 1 - hw/xfree86/os-support/xf86_libc.h | 2 -- hw/xfree86/os-support/xf86drm.h | 1 - hw/xfree86/os-support/xf86drmCompat.h | 1 - hw/xfree86/parser/Configint.h | 1 - hw/xfree86/parser/DRI.c | 1 - hw/xfree86/parser/Device.c | 1 - hw/xfree86/parser/Files.c | 1 - hw/xfree86/parser/Flags.c | 1 - hw/xfree86/parser/Input.c | 1 - hw/xfree86/parser/Keyboard.c | 1 - hw/xfree86/parser/Layout.c | 1 - hw/xfree86/parser/Module.c | 1 - hw/xfree86/parser/Monitor.c | 1 - hw/xfree86/parser/Pointer.c | 1 - hw/xfree86/parser/Screen.c | 1 - hw/xfree86/parser/Vendor.c | 1 - hw/xfree86/parser/Video.c | 1 - hw/xfree86/parser/configProcs.h | 1 - hw/xfree86/parser/cpconfig.c | 1 - hw/xfree86/parser/read.c | 1 - hw/xfree86/parser/scan.c | 1 - hw/xfree86/parser/write.c | 1 - hw/xfree86/parser/xf86Optrec.h | 1 - hw/xfree86/parser/xf86Parser.h | 1 - hw/xfree86/parser/xf86tokens.h | 1 - hw/xfree86/rac/xf86RAC.h | 1 - hw/xfree86/ramdac/BT.c | 1 - hw/xfree86/ramdac/BT.h | 1 - hw/xfree86/ramdac/BTPriv.h | 1 - hw/xfree86/ramdac/IBM.c | 1 - hw/xfree86/ramdac/IBM.h | 1 - hw/xfree86/ramdac/IBMPriv.h | 1 - hw/xfree86/ramdac/TI.c | 1 - hw/xfree86/ramdac/TI.h | 1 - hw/xfree86/ramdac/TIPriv.h | 1 - hw/xfree86/ramdac/xf86Cursor.c | 1 - hw/xfree86/ramdac/xf86Cursor.h | 1 - hw/xfree86/ramdac/xf86CursorPriv.h | 1 - hw/xfree86/ramdac/xf86HWCurs.c | 1 - hw/xfree86/ramdac/xf86RamDac.c | 1 - hw/xfree86/ramdac/xf86RamDac.h | 1 - hw/xfree86/ramdac/xf86RamDacCmap.c | 1 - hw/xfree86/ramdac/xf86RamDacPriv.h | 1 - hw/xfree86/scanpci/xf86PciData.h | 1 - hw/xfree86/scanpci/xf86PciStdIds.h | 1 - hw/xfree86/scanpci/xf86PciStr.h | 1 - hw/xfree86/scanpci/xf86ScanPci.h | 1 - hw/xfree86/shadowfb/shadow.c | 1 - hw/xfree86/shadowfb/shadowfb.h | 1 - hw/xfree86/utils/gtf/gtf.c | 2 -- hw/xfree86/utils/ioport/ioport.c | 1 - hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c | 1 - hw/xfree86/utils/kbd_mode/sun-kbd_mode.c | 2 -- hw/xfree86/utils/pcitweak/pcitweak.c | 1 - hw/xfree86/utils/scanpci/scanpci.c | 1 - hw/xfree86/utils/xorgcfg/accessx.c | 1 - hw/xfree86/utils/xorgcfg/card-cfg.c | 1 - hw/xfree86/utils/xorgcfg/cards.c | 1 - hw/xfree86/utils/xorgcfg/cards.h | 1 - hw/xfree86/utils/xorgcfg/config.c | 1 - hw/xfree86/utils/xorgcfg/config.h | 1 - hw/xfree86/utils/xorgcfg/expert.c | 1 - hw/xfree86/utils/xorgcfg/help.c | 1 - hw/xfree86/utils/xorgcfg/interface.c | 2 -- hw/xfree86/utils/xorgcfg/keyboard-cfg.c | 1 - hw/xfree86/utils/xorgcfg/keyboard-cfg.h | 1 - hw/xfree86/utils/xorgcfg/loader.c | 2 -- hw/xfree86/utils/xorgcfg/loader.h | 1 - hw/xfree86/utils/xorgcfg/loadmod.c | 1 - hw/xfree86/utils/xorgcfg/monitor-cfg.c | 1 - hw/xfree86/utils/xorgcfg/monitor-cfg.h | 1 - hw/xfree86/utils/xorgcfg/mouse-cfg.c | 1 - hw/xfree86/utils/xorgcfg/options.c | 1 - hw/xfree86/utils/xorgcfg/options.h | 1 - hw/xfree86/utils/xorgcfg/screen-cfg.c | 1 - hw/xfree86/utils/xorgcfg/screen-cfg.h | 1 - hw/xfree86/utils/xorgcfg/screen.c | 1 - hw/xfree86/utils/xorgcfg/screen.h | 1 - hw/xfree86/utils/xorgcfg/startx.c | 1 - hw/xfree86/utils/xorgcfg/stubs.c | 1 - hw/xfree86/utils/xorgcfg/stubs.h | 1 - hw/xfree86/utils/xorgcfg/text-mode.c | 2 -- hw/xfree86/utils/xorgcfg/vidmode.c | 1 - hw/xfree86/utils/xorgcfg/vidmode.h | 1 - hw/xfree86/utils/xorgcfg/xf86config.c | 1 - hw/xfree86/utils/xorgcfg/xf86config.h | 1 - hw/xfree86/utils/xorgconfig/cards.c | 2 -- hw/xfree86/utils/xorgconfig/cards.h | 1 - hw/xfree86/utils/xorgconfig/xorgconfig.c | 2 -- hw/xfree86/vbe/vbe.c | 1 - hw/xfree86/vbe/vbe.h | 1 - hw/xfree86/vbe/vbeModes.c | 1 - hw/xfree86/vbe/vbeModes.h | 1 - hw/xfree86/vgahw/vgaCmap.c | 1 - hw/xfree86/vgahw/vgaHW.c | 1 - hw/xfree86/vgahw/vgaHW.h | 1 - hw/xfree86/xaa/xaa.h | 1 - hw/xfree86/xaa/xaaBitBlt.c | 1 - hw/xfree86/xaa/xaaBitOrder.c | 1 - hw/xfree86/xaa/xaaBitmap.c | 1 - hw/xfree86/xaa/xaaCpyArea.c | 1 - hw/xfree86/xaa/xaaCpyPlane.c | 1 - hw/xfree86/xaa/xaaCpyWin.c | 1 - hw/xfree86/xaa/xaaDashLine.c | 1 - hw/xfree86/xaa/xaaFallback.c | 1 - hw/xfree86/xaa/xaaFillArc.c | 1 - hw/xfree86/xaa/xaaFillPoly.c | 1 - hw/xfree86/xaa/xaaFillRect.c | 1 - hw/xfree86/xaa/xaaGC.c | 1 - hw/xfree86/xaa/xaaGCmisc.c | 1 - hw/xfree86/xaa/xaaImage.c | 1 - hw/xfree86/xaa/xaaInit.c | 1 - hw/xfree86/xaa/xaaLine.c | 1 - hw/xfree86/xaa/xaaLineMisc.c | 1 - hw/xfree86/xaa/xaaNonTEGlyph.c | 1 - hw/xfree86/xaa/xaaNonTEText.c | 1 - hw/xfree86/xaa/xaaOffscreen.c | 1 - hw/xfree86/xaa/xaaOverlay.c | 2 -- hw/xfree86/xaa/xaaOverlayDF.c | 1 - hw/xfree86/xaa/xaaPCache.c | 1 - hw/xfree86/xaa/xaaPaintWin.c | 2 -- hw/xfree86/xaa/xaaPict.c | 1 - hw/xfree86/xaa/xaaRect.c | 1 - hw/xfree86/xaa/xaaSpans.c | 1 - hw/xfree86/xaa/xaaStateChange.c | 1 - hw/xfree86/xaa/xaaStipple.c | 1 - hw/xfree86/xaa/xaaTEGlyph.c | 1 - hw/xfree86/xaa/xaaTEText.c | 1 - hw/xfree86/xaa/xaaTables.c | 1 - hw/xfree86/xaa/xaaWideLine.c | 2 -- hw/xfree86/xaa/xaacexp.h | 1 - hw/xfree86/xaa/xaalocal.h | 1 - hw/xfree86/xaa/xaawrap.h | 1 - hw/xfree86/xf1bpp/mfbmap.h | 1 - hw/xfree86/xf1bpp/mfbunmap.h | 1 - hw/xfree86/xf1bpp/xf1bpp.h | 1 - hw/xfree86/xf4bpp/OScompiler.h | 1 - hw/xfree86/xf4bpp/emulOpStip.c | 1 - hw/xfree86/xf4bpp/emulRepAre.c | 1 - hw/xfree86/xf4bpp/emulTile.c | 1 - hw/xfree86/xf4bpp/ibmTrace.h | 1 - hw/xfree86/xf4bpp/mfbbres.c | 1 - hw/xfree86/xf4bpp/mfbbresd.c | 1 - hw/xfree86/xf4bpp/mfbfillarc.c | 1 - hw/xfree86/xf4bpp/mfbhrzvert.c | 1 - hw/xfree86/xf4bpp/mfbimggblt.c | 1 - hw/xfree86/xf4bpp/mfbline.c | 1 - hw/xfree86/xf4bpp/mfbzerarc.c | 1 - hw/xfree86/xf4bpp/offscreen.c | 1 - hw/xfree86/xf4bpp/ppcArea.c | 1 - hw/xfree86/xf4bpp/ppcBStore.c | 1 - hw/xfree86/xf4bpp/ppcCReduce.c | 1 - hw/xfree86/xf4bpp/ppcClip.c | 1 - hw/xfree86/xf4bpp/ppcCpArea.c | 1 - hw/xfree86/xf4bpp/ppcDepth.c | 1 - hw/xfree86/xf4bpp/ppcFillRct.c | 1 - hw/xfree86/xf4bpp/ppcGC.c | 1 - hw/xfree86/xf4bpp/ppcGCstr.h | 1 - hw/xfree86/xf4bpp/ppcGetSp.c | 1 - hw/xfree86/xf4bpp/ppcIO.c | 1 - hw/xfree86/xf4bpp/ppcImg.c | 1 - hw/xfree86/xf4bpp/ppcPixFS.c | 1 - hw/xfree86/xf4bpp/ppcPixmap.c | 1 - hw/xfree86/xf4bpp/ppcPntWin.c | 1 - hw/xfree86/xf4bpp/ppcPolyPnt.c | 1 - hw/xfree86/xf4bpp/ppcPolyRec.c | 1 - hw/xfree86/xf4bpp/ppcQuery.c | 1 - hw/xfree86/xf4bpp/ppcRslvC.c | 1 - hw/xfree86/xf4bpp/ppcSetSp.c | 1 - hw/xfree86/xf4bpp/ppcSpMcro.h | 1 - hw/xfree86/xf4bpp/ppcWinFS.c | 1 - hw/xfree86/xf4bpp/ppcWindow.c | 1 - hw/xfree86/xf4bpp/vgaBitBlt.c | 1 - hw/xfree86/xf4bpp/vgaGC.c | 1 - hw/xfree86/xf4bpp/vgaImages.c | 1 - hw/xfree86/xf4bpp/vgaReg.h | 1 - hw/xfree86/xf4bpp/vgaSolid.c | 1 - hw/xfree86/xf4bpp/vgaStipple.c | 1 - hw/xfree86/xf4bpp/vgaVideo.h | 1 - hw/xfree86/xf4bpp/wm3.c | 1 - hw/xfree86/xf4bpp/wm3.h | 1 - hw/xfree86/xf4bpp/xf4bpp.h | 1 - hw/xfree86/xf8_32bpp/cfb8_32.h | 1 - hw/xfree86/xf8_32bpp/cfbbstore.c | 1 - hw/xfree86/xf8_32bpp/cfbcpyarea.c | 1 - hw/xfree86/xf8_32bpp/cfbgc.c | 1 - hw/xfree86/xf8_32bpp/cfbgcunder.c | 1 - hw/xfree86/xf8_32bpp/cfbimage.c | 1 - hw/xfree86/xf8_32bpp/cfbpntwin.c | 2 -- hw/xfree86/xf8_32bpp/cfbscrinit.c | 1 - hw/xfree86/xf8_32bpp/cfbwindow.c | 1 - hw/xfree86/xf8_32bpp/xf86overlay.c | 1 - hw/xnest/Args.c | 1 - hw/xnest/Args.h | 1 - hw/xnest/Color.c | 1 - hw/xnest/Color.h | 1 - hw/xnest/Cursor.c | 2 -- hw/xnest/Display.c | 2 -- hw/xnest/Display.h | 2 -- hw/xnest/Drawable.h | 1 - hw/xnest/Events.c | 2 -- hw/xnest/Events.h | 1 - hw/xnest/Font.c | 2 -- hw/xnest/GC.c | 2 -- hw/xnest/GCOps.c | 2 -- hw/xnest/GCOps.h | 1 - hw/xnest/Handlers.c | 2 -- hw/xnest/Handlers.h | 1 - hw/xnest/Init.c | 2 -- hw/xnest/Init.h | 1 - hw/xnest/Keyboard.c | 3 --- hw/xnest/Keyboard.h | 1 - hw/xnest/Pixmap.c | 2 -- hw/xnest/Pointer.c | 1 - hw/xnest/Pointer.h | 1 - hw/xnest/Screen.c | 2 -- hw/xnest/Screen.h | 1 - hw/xnest/Visual.c | 1 - hw/xnest/Visual.h | 1 - hw/xnest/Window.c | 2 -- hw/xnest/XNCursor.h | 2 -- hw/xnest/XNFont.h | 1 - hw/xnest/XNGC.h | 1 - hw/xnest/XNPixmap.h | 2 -- hw/xnest/XNWindow.h | 2 -- hw/xnest/Xnest.h | 1 - hw/xnest/os2Stub.c | 1 - hw/xprint/AttrValid.c | 1 - hw/xprint/AttrValid.h | 1 - hw/xprint/DiPrint.h | 1 - hw/xprint/Init.c | 1 - hw/xprint/Oid.c | 1 - hw/xprint/Oid.h | 1 - hw/xprint/OidDefs.h | 1 - hw/xprint/OidStrs.h | 1 - hw/xprint/Util.c | 2 -- hw/xprint/ValTree.c | 1 - hw/xprint/attributes.c | 1 - hw/xprint/attributes.h | 1 - hw/xprint/ddxInit.c | 1 - hw/xprint/mediaSizes.c | 1 - hw/xprint/pcl/Makefile.am.inc | 3 +-- hw/xprint/pcl/Pcl.h | 2 -- hw/xprint/pcl/PclArc.c | 2 -- hw/xprint/pcl/PclArea.c | 2 -- hw/xprint/pcl/PclAttVal.c | 1 - hw/xprint/pcl/PclAttr.c | 1 - hw/xprint/pcl/PclColor.c | 2 -- hw/xprint/pcl/PclCursor.c | 2 -- hw/xprint/pcl/PclDef.h | 1 - hw/xprint/pcl/PclFonts.c | 1 - hw/xprint/pcl/PclGC.c | 2 -- hw/xprint/pcl/PclInit.c | 2 -- hw/xprint/pcl/PclLine.c | 2 -- hw/xprint/pcl/PclMisc.c | 2 -- hw/xprint/pcl/PclPixel.c | 2 -- hw/xprint/pcl/PclPolygon.c | 2 -- hw/xprint/pcl/PclPrint.c | 2 -- hw/xprint/pcl/PclSFonts.c | 2 -- hw/xprint/pcl/PclSFonts.h | 1 - hw/xprint/pcl/PclSpans.c | 2 -- hw/xprint/pcl/PclText.c | 2 -- hw/xprint/pcl/PclWindow.c | 2 -- hw/xprint/pcl/Pclmap.h | 2 -- hw/xprint/ps/Makefile.am | 2 +- hw/xprint/ps/Ps.h | 1 - hw/xprint/ps/PsArc.c | 1 - hw/xprint/ps/PsArea.c | 1 - hw/xprint/ps/PsAttVal.c | 1 - hw/xprint/ps/PsAttr.c | 1 - hw/xprint/ps/PsColor.c | 1 - hw/xprint/ps/PsDef.h | 1 - hw/xprint/ps/PsFonts.c | 1 - hw/xprint/ps/PsGC.c | 1 - hw/xprint/ps/PsImageUtil.c | 1 - hw/xprint/ps/PsInit.c | 1 - hw/xprint/ps/PsLine.c | 1 - hw/xprint/ps/PsMisc.c | 1 - hw/xprint/ps/PsPixel.c | 1 - hw/xprint/ps/PsPixmap.c | 1 - hw/xprint/ps/PsPolygon.c | 1 - hw/xprint/ps/PsPrint.c | 1 - hw/xprint/ps/PsSpans.c | 2 -- hw/xprint/ps/PsText.c | 1 - hw/xprint/ps/PsWindow.c | 1 - hw/xprint/ps/psout.c | 1 - hw/xprint/ps/psout.h | 1 - hw/xprint/raster/Makefile.am | 3 +-- hw/xprint/raster/Raster.c | 2 -- hw/xprint/raster/Raster.h | 1 - hw/xprint/raster/RasterAttVal.c | 2 -- hw/xprint/spooler.c | 1 - hw/xprint/spooler.h | 1 - hw/xwin/InitInput.c | 1 - hw/xwin/InitOutput.c | 1 - hw/xwin/win.h | 1 - hw/xwin/winallpriv.c | 1 - hw/xwin/wincmap.c | 1 - hw/xwin/winconfig.c | 1 - hw/xwin/wincursor.c | 1 - hw/xwin/winfillsp.c | 1 - hw/xwin/wingetsp.c | 1 - hw/xwin/winkeybd.c | 1 - hw/xwin/winkeybd.h | 1 - hw/xwin/winkeymap.h | 1 - hw/xwin/winkeynames.h | 1 - hw/xwin/winmouse.c | 1 - hw/xwin/winmultiwindowicons.c | 1 - hw/xwin/winmultiwindowshape.c | 1 - hw/xwin/winmultiwindowwindow.c | 1 - hw/xwin/winmultiwindowwm.c | 1 - hw/xwin/winmultiwindowwndproc.c | 1 - hw/xwin/winnativegdi.c | 1 - hw/xwin/winpfbdd.c | 1 - hw/xwin/winpixmap.c | 1 - hw/xwin/winpushpxl.c | 1 - hw/xwin/winscrinit.c | 1 - hw/xwin/winsetsp.c | 1 - hw/xwin/winshaddd.c | 1 - hw/xwin/winshadddnl.c | 1 - hw/xwin/winwakeup.c | 1 - hw/xwin/winwindow.c | 1 - hw/xwin/winwindow.h | 1 - hw/xwin/winwndproc.c | 1 - include/XIstubs.h | 1 - include/bstore.h | 1 - include/bstorestr.h | 1 - include/closestr.h | 2 -- include/closure.h | 1 - include/colormap.h | 2 -- include/colormapst.h | 1 - include/cursor.h | 3 --- include/cursorstr.h | 2 -- include/dix.h | 2 -- include/dixevents.h | 1 - include/dixfont.h | 2 -- include/dixfontstr.h | 1 - include/dixgrabs.h | 1 - include/dixstruct.h | 2 -- include/exevents.h | 1 - include/extension.h | 2 -- include/extinit.h | 1 - include/extnsionst.h | 2 -- include/gc.h | 2 -- include/gcstruct.h | 2 -- include/globals.h | 2 -- include/input.h | 2 -- include/inputstr.h | 2 -- include/misc.h | 2 -- include/miscstruct.h | 2 -- include/opaque.h | 2 -- include/os.h | 2 -- include/pixmap.h | 1 - include/pixmapstr.h | 1 - include/property.h | 2 -- include/propertyst.h | 2 -- include/region.h | 1 - include/regionstr.h | 3 --- include/resource.h | 2 -- include/rgb.h | 1 - include/screenint.h | 2 -- include/scrnintstr.h | 2 -- include/selection.h | 1 - include/servermd.h | 3 --- include/site.h | 2 -- include/swaprep.h | 1 - include/swapreq.h | 1 - include/validate.h | 2 -- include/window.h | 1 - include/windowstr.h | 2 -- mfb/fastblt.h | 2 -- mfb/maskbits.c | 2 -- mfb/maskbits.h | 2 -- mfb/mergerop.h | 2 -- mfb/mfb.h | 2 -- mfb/mfbbitblt.c | 2 -- mfb/mfbblt.c | 2 -- mfb/mfbbres.c | 2 -- mfb/mfbbresd.c | 2 -- mfb/mfbbstore.c | 1 - mfb/mfbclip.c | 2 -- mfb/mfbcmap.c | 2 -- mfb/mfbfillarc.c | 2 -- mfb/mfbfillrct.c | 2 -- mfb/mfbfillsp.c | 2 -- mfb/mfbfont.c | 1 - mfb/mfbgc.c | 2 -- mfb/mfbgetsp.c | 2 -- mfb/mfbhrzvert.c | 2 -- mfb/mfbimage.c | 2 -- mfb/mfbimggblt.c | 2 -- mfb/mfbline.c | 2 -- mfb/mfbmisc.c | 1 - mfb/mfbpixmap.c | 1 - mfb/mfbply1rct.c | 2 -- mfb/mfbplygblt.c | 2 -- mfb/mfbpntarea.c | 1 - mfb/mfbpntwin.c | 1 - mfb/mfbpolypnt.c | 2 -- mfb/mfbpushpxl.c | 2 -- mfb/mfbscrclse.c | 2 -- mfb/mfbscrinit.c | 2 -- mfb/mfbsetsp.c | 2 -- mfb/mfbtegblt.c | 2 -- mfb/mfbtile.c | 2 -- mfb/mfbwindow.c | 1 - mfb/mfbzerarc.c | 2 -- mi/cbrt.c | 2 -- mi/mi.h | 2 -- mi/miarc.c | 3 --- mi/mibank.c | 1 - mi/mibank.h | 1 - mi/mibitblt.c | 2 -- mi/mibstore.c | 2 -- mi/mibstore.h | 2 -- mi/mibstorest.h | 2 -- mi/micmap.c | 2 -- mi/micmap.h | 1 - mi/micoord.h | 1 - mi/micursor.c | 2 -- mi/midash.c | 2 -- mi/midispcur.c | 2 -- mi/mieq.c | 2 -- mi/miexpose.c | 3 --- mi/mifillarc.c | 2 -- mi/mifillarc.h | 2 -- mi/mifillrct.c | 2 -- mi/mifpoly.h | 2 -- mi/mifpolycon.c | 2 -- mi/migc.c | 2 -- mi/migc.h | 2 -- mi/miglblt.c | 2 -- mi/miinitext.c | 3 --- mi/miline.h | 2 -- mi/mioverlay.c | 1 - mi/mioverlay.h | 1 - mi/mipointer.c | 2 -- mi/mipointer.h | 2 -- mi/mipointrst.h | 2 -- mi/mipoly.c | 1 - mi/mipoly.h | 2 -- mi/mipolycon.c | 2 -- mi/mipolygen.c | 2 -- mi/mipolypnt.c | 2 -- mi/mipolyrect.c | 2 -- mi/mipolyseg.c | 2 -- mi/mipolytext.c | 2 -- mi/mipolyutil.c | 2 -- mi/mipushpxl.c | 2 -- mi/miregion.c | 2 -- mi/miscanfill.h | 1 - mi/miscrinit.c | 2 -- mi/mispans.c | 2 -- mi/mispans.h | 2 -- mi/misprite.c | 2 -- mi/misprite.h | 2 -- mi/mispritest.h | 2 -- mi/mistruct.h | 1 - mi/mivalidate.h | 1 - mi/mivaltree.c | 3 --- mi/miwideline.c | 2 -- mi/miwideline.h | 2 -- mi/miwindow.c | 2 -- mi/mizerarc.c | 2 -- mi/mizerarc.h | 2 -- mi/mizerclip.c | 1 - mi/mizerline.c | 2 -- miext/rootless/accel/rlAccel.c | 1 - miext/rootless/accel/rlAccel.h | 1 - miext/rootless/accel/rlBlt.c | 1 - miext/rootless/accel/rlCopy.c | 1 - miext/rootless/accel/rlFill.c | 1 - miext/rootless/accel/rlFillRect.c | 1 - miext/rootless/accel/rlFillSpans.c | 1 - miext/rootless/accel/rlGlyph.c | 1 - miext/rootless/accel/rlSolid.c | 1 - miext/rootless/rootless.h | 1 - miext/rootless/rootlessCommon.c | 1 - miext/rootless/rootlessCommon.h | 1 - miext/rootless/rootlessConfig.h | 1 - miext/rootless/rootlessGC.c | 1 - miext/rootless/rootlessScreen.c | 1 - miext/rootless/rootlessValTree.c | 1 - miext/rootless/rootlessWindow.c | 2 -- miext/rootless/rootlessWindow.h | 1 - miext/rootless/safeAlpha/safeAlpha.h | 1 - miext/rootless/safeAlpha/safeAlphaPicture.c | 1 - miext/rootless/safeAlpha/safeAlphaWindow.c | 2 -- miext/shadow/shadow.h | 1 - miext/shadow/shpacked.c | 1 - miext/shadow/shplanar.c | 1 - miext/shadow/shplanar8.c | 1 - miext/shadow/shrotate.c | 1 - miext/shadow/shrotpack.h | 1 - os/WaitFor.c | 2 -- os/access.c | 3 --- os/auth.c | 2 -- os/connection.c | 2 -- os/io.c | 2 -- os/k5auth.c | 2 -- os/log.c | 1 - os/mitauth.c | 2 -- os/oscolor.c | 2 -- os/osdep.h | 2 -- os/osinit.c | 2 -- os/rpcauth.c | 2 -- os/secauth.c | 2 -- os/utils.c | 3 --- os/xalloc.c | 1 - os/xdmauth.c | 2 -- os/xdmcp.c | 3 --- randr/mirandr.c | 1 - randr/randr.c | 1 - randr/randrstr.h | 1 - record/record.c | 3 --- record/set.c | 2 -- record/set.h | 1 - render/animcur.c | 1 - render/glyph.c | 1 - render/glyphstr.h | 1 - render/miglyph.c | 1 - render/miindex.c | 1 - render/mipict.c | 1 - render/mipict.h | 1 - render/mirect.c | 1 - render/mitrap.c | 1 - render/mitri.c | 1 - render/picture.c | 1 - render/picture.h | 1 - render/render.c | 2 -- xkb/XKBAlloc.c | 2 -- xkb/XKBGAlloc.c | 2 -- xkb/XKBMAlloc.c | 2 -- xkb/XKBMisc.c | 2 -- xkb/ddxBeep.c | 2 -- xkb/ddxCtrls.c | 2 -- xkb/ddxDevBtn.c | 2 -- xkb/ddxFakeBtn.c | 1 - xkb/ddxFakeMtn.c | 3 --- xkb/ddxInit.c | 1 - xkb/ddxKeyClick.c | 1 - xkb/ddxKillSrv.c | 2 -- xkb/ddxLEDs.c | 1 - xkb/ddxList.c | 2 -- xkb/ddxLoad.c | 2 -- xkb/ddxPrivate.c | 1 - xkb/ddxVT.c | 2 -- xkb/maprules.c | 2 -- xkb/xkb.c | 2 -- xkb/xkbAccessX.c | 2 -- xkb/xkbActions.c | 3 --- xkb/xkbDflts.h | 2 -- xkb/xkbEvents.c | 2 -- xkb/xkbInit.c | 3 --- xkb/xkbLEDs.c | 2 -- xkb/xkbPrKeyEv.c | 2 -- xkb/xkbPrOtherEv.c | 1 - xkb/xkbSwap.c | 2 -- xkb/xkbUtils.c | 2 -- xkb/xkberrs.c | 2 -- xkb/xkbfmisc.c | 2 -- xkb/xkmread.c | 2 -- 1105 files changed, 6 insertions(+), 1511 deletions(-) mode change 100755 => 100644 hw/xwin/winkeymap.h mode change 100755 => 100644 hw/xwin/winkeynames.h mode change 100755 => 100644 hw/xwin/winmultiwindowicons.c mode change 100755 => 100644 hw/xwin/winmultiwindowshape.c mode change 100755 => 100644 hw/xwin/winmultiwindowwndproc.c (limited to 'miext') diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c index be846be83..900a9a96e 100644 --- a/GL/apple/aglGlx.c +++ b/GL/apple/aglGlx.c @@ -32,7 +32,6 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c index 448b1f76a..8cba1c63d 100644 --- a/GL/apple/indirect.c +++ b/GL/apple/indirect.c @@ -31,7 +31,6 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c index e97ace6ba..8e336268d 100644 --- a/GL/glx/g_disptab.c +++ b/GL/glx/g_disptab.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h index a83c7a8ab..4a1c5e975 100644 --- a/GL/glx/g_disptab.h +++ b/GL/glx/g_disptab.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c index 255f3832c..087fb2472 100644 --- a/GL/glx/g_disptab_EXT.c +++ b/GL/glx/g_disptab_EXT.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h index b5ecc6995..62a7517c4 100644 --- a/GL/glx/g_disptab_EXT.h +++ b/GL/glx/g_disptab_EXT.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c index e2aaf3a71..f0a6474c1 100644 --- a/GL/glx/glxcmds.c +++ b/GL/glx/glxcmds.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.12 2004/01/28 18:11:50 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c index 4ce53b7b7..bb86243ca 100644 --- a/GL/glx/glxcmdsswap.c +++ b/GL/glx/glxcmdsswap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.10 2004/01/28 18:11:50 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h index 68e26609d..a54e323cc 100644 --- a/GL/glx/glxcontext.h +++ b/GL/glx/glxcontext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.4 2002/02/22 21:45:07 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h index e6d2cd686..20e9b437f 100644 --- a/GL/glx/glxdrawable.h +++ b/GL/glx/glxdrawable.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index 176883da7..9879b34c6 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $ ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the ** License. You may obtain a copy of the License at Silicon Graphics, Inc., diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h index 03a2464ba..f48f331d4 100644 --- a/GL/glx/glxext.h +++ b/GL/glx/glxext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index 3809af373..e388fceb1 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.14 2004/02/09 23:46:31 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxscreens.h b/GL/glx/glxscreens.h index 96373dbee..8beec17ec 100644 --- a/GL/glx/glxscreens.h +++ b/GL/glx/glxscreens.h @@ -5,7 +5,6 @@ #ifndef _GLX_screens_h_ #define _GLX_screens_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h index ddb3ca9a6..8ece1e2a6 100644 --- a/GL/glx/glxserver.h +++ b/GL/glx/glxserver.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c index bc9adea38..1f172929f 100644 --- a/GL/glx/glxutil.c +++ b/GL/glx/glxutil.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxutil.h b/GL/glx/glxutil.h index 7b5494c9a..c30a1f9cd 100644 --- a/GL/glx/glxutil.h +++ b/GL/glx/glxutil.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/GL/glx/render2.c b/GL/glx/render2.c index b126638a1..5b3d3e6d0 100644 --- a/GL/glx/render2.c +++ b/GL/glx/render2.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.8 2004/02/03 23:04:08 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/render2swap.c b/GL/glx/render2swap.c index 81de81ff9..23b7ebd37 100644 --- a/GL/glx/render2swap.c +++ b/GL/glx/render2swap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.6 2002/01/14 22:47:08 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/rensize.c b/GL/glx/rensize.c index d37958207..47d698905 100644 --- a/GL/glx/rensize.c +++ b/GL/glx/rensize.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/rensizetab.c b/GL/glx/rensizetab.c index c9bd1a73b..b9768a5b5 100644 --- a/GL/glx/rensizetab.c +++ b/GL/glx/rensizetab.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.5 2004/01/28 18:11:53 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/single2.c b/GL/glx/single2.c index efc7220f3..3387af2a2 100644 --- a/GL/glx/single2.c +++ b/GL/glx/single2.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.8 2004/02/10 22:54:15 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c index d1f56c2c2..41a42bb0f 100644 --- a/GL/glx/single2swap.c +++ b/GL/glx/single2swap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.7 2002/01/14 22:47:08 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlepixswap.c b/GL/glx/singlepixswap.c index 91cebff46..59d1a690c 100644 --- a/GL/glx/singlepixswap.c +++ b/GL/glx/singlepixswap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlesize.c b/GL/glx/singlesize.c index 116c6dc41..b5a74f30d 100644 --- a/GL/glx/singlesize.c +++ b/GL/glx/singlesize.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.7tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/unpack.h b/GL/glx/unpack.h index 723fb85f3..70ba1a893 100644 --- a/GL/glx/unpack.h +++ b/GL/glx/unpack.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.4 2002/01/14 22:47:08 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/GL/mesa/X/xf86glx.c b/GL/mesa/X/xf86glx.c index 6015e15d2..94959d628 100644 --- a/GL/mesa/X/xf86glx.c +++ b/GL/mesa/X/xf86glx.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.19 2003/07/16 01:38:27 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/GL/mesa/X/xf86glx_util.c b/GL/mesa/X/xf86glx_util.c index 4092a2654..ffb528003 100644 --- a/GL/mesa/X/xf86glx_util.c +++ b/GL/mesa/X/xf86glx_util.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c,v 1.5 2000/03/02 16:07:39 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/GL/mesa/X/xf86glx_util.h b/GL/mesa/X/xf86glx_util.h index 809c1550f..bb314128d 100644 --- a/GL/mesa/X/xf86glx_util.h +++ b/GL/mesa/X/xf86glx_util.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h,v 1.5 2000/08/10 17:40:29 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/GL/mesa/X/xf86glxint.h b/GL/mesa/X/xf86glxint.h index 4e51215bc..8c7e91327 100644 --- a/GL/mesa/X/xf86glxint.h +++ b/GL/mesa/X/xf86glxint.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h,v 1.4 2002/02/22 21:45:08 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c index 1b598b79d..73a20c1f6 100644 --- a/XTrap/xtrapddmi.c +++ b/XTrap/xtrapddmi.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 1c4f5ca06..c5d640d0b 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/XTrap/xtrapdi.c,v 1.6 2006/02/10 22:00:19 anholt Exp $ */ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH. diff --git a/Xext/EVI.c b/Xext/EVI.c index b59180685..8fe3481d4 100644 --- a/Xext/EVI.c +++ b/Xext/EVI.c @@ -1,4 +1,3 @@ -/* $Xorg: EVI.c,v 1.3 2000/08/17 19:47:55 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,7 +20,6 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h index 857e7565a..e6581909f 100644 --- a/Xext/EVIstruct.h +++ b/Xext/EVIstruct.h @@ -1,4 +1,3 @@ -/* $Xorg: EVIstruct.h,v 1.3 2000/08/17 19:47:55 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,7 +20,6 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 9de355c59..b047945c0 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.10tsi Exp $ */ /* Copyright 1996, 1998, 2001 The Open Group @@ -24,7 +23,6 @@ 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. */ -/* $Xorg: appgroup.c,v 1.6 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 1af8a930b..fcd848aec 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -1,4 +1,3 @@ -/* $Xorg: bigreq.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/cup.c b/Xext/cup.c index 879130ece..10d13bae0 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -1,4 +1,3 @@ -/* $Xorg: cup.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1997, 1998 The Open Group @@ -24,7 +23,6 @@ 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/Xserver/Xext/cup.c,v 1.11tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/dpms.c b/Xext/dpms.c index ea0a1ccdf..aced40639 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -1,4 +1,3 @@ -/* $Xorg: dpms.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -33,7 +32,6 @@ Equipment Corporation. * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00 */ -/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h index ae1e6e25a..f5485ea79 100644 --- a/Xext/dpmsproc.h +++ b/Xext/dpmsproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */ /* Prototypes for functions that the DDX must provide */ diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c index 128c57bb0..9f99a2d22 100644 --- a/Xext/dpmsstubs.c +++ b/Xext/dpmsstubs.c @@ -1,4 +1,3 @@ -/* $Xorg: dpmsstubs.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +25,6 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.4 2001/01/17 22:13:15 dawes Exp $ */ typedef int Bool; diff --git a/Xext/fontcache.c b/Xext/fontcache.c index 9ab23a122..00a45c90e 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -27,7 +27,6 @@ * * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.7 2003/10/28 23:08:43 tsi Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 9933fe0fd..e0361dda4 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.15 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index 8585c52d2..04fc487d8 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.5tsi Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $Xorg: mbufbf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index c986217ee..16717d330 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.3 2001/07/23 13:15:44 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mbufpx.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index f7b0ee55c..a11c9a8ad 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.6 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,7 +26,6 @@ in this Software without prior written authorization from The Open Group. /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 5d533a464..6b8b5f2f7 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -1,4 +1,3 @@ -/* $Xorg: panoramiX.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index 6cbb94dd3..7b3339204 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -1,5 +1,4 @@ /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. @@ -28,7 +27,6 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index e0548df7b..da445ffe1 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXSwap.c,v 1.4 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h index 9da5876fd..6cee650ac 100644 --- a/Xext/panoramiXh.h +++ b/Xext/panoramiXh.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.2 2003/09/13 21:33:03 dawes Exp $ */ /* * Server dispatcher function replacements diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 79a5a3290..8bb4c593d 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXprocs.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -26,7 +25,6 @@ Equipment Corporation. /* Massively rewritten by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index dc3b3d805..bb032cfae 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index 67caa5613..d9c569609 100644 --- a/Xext/sampleEVI.c +++ b/Xext/sampleEVI.c @@ -1,4 +1,3 @@ -/* $Xorg: sampleEVI.c,v 1.3 2000/08/17 19:47:58 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this diff --git a/Xext/saver.c b/Xext/saver.c index d873ffde6..1d223ae53 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,6 +1,4 @@ -/* $XdotOrg: xserver/xorg/Xext/saver.c,v 1.12 2006/03/31 18:49:38 fredrik Exp $ */ /* - * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ * Copyright (c) 1992 X Consortium @@ -28,7 +26,6 @@ in this Software without prior written authorization from the X Consortium. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/security.c b/Xext/security.c index 187e80004..4684d783b 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/security.c,v 1.6 2006/03/28 01:20:59 ajax Exp $ */ -/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,6 @@ 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/Xserver/Xext/security.c,v 1.16tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/shape.c b/Xext/shape.c index 9f46a798e..4d9d3fb5b 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/shape.c,v 1.9 2005/07/03 08:53:36 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -26,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/shm.c b/Xext/shm.c index e56d45e8e..be79862cb 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,7 +26,6 @@ in this Software without prior written authorization from The Open Group. /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ -/* $Xorg: shm.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ #define SHM diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 30be8c001..f8cedbe6e 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -1,5 +1,4 @@ /* - * $Xorg: sleepuntil.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.6 2003/07/16 01:38:30 dawes Exp $ */ /* dixsleep.c - implement millisecond timeouts for X clients */ diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h index 0b99148a4..a3618d99c 100644 --- a/Xext/sleepuntil.h +++ b/Xext/sleepuntil.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.h,v 1.2 2003/11/17 22:20:27 dawes Exp $ */ /* * Copyright (C) 2001 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/Xext/sync.c b/Xext/sync.c index e1383cea3..7def85b94 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -1,4 +1,3 @@ -/* $Xorg: sync.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1991, 1993, 1998 The Open Group @@ -50,7 +49,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.13 2003/09/02 18:19:01 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 45629e660..f26218e97 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -1,4 +1,3 @@ -/* $Xorg: xcmisc.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/Xext/xevie.c b/Xext/xevie.c index 41fdd1d4b..e979e7e4d 100644 --- a/Xext/xevie.c +++ b/Xext/xevie.c @@ -30,7 +30,6 @@ or other dealings in this Software without prior written authorization of the copyright holder. ************************************************************/ -/* $XdotOrg: xserver/xorg/Xext/xevie.c,v 1.11 2005/10/06 17:55:54 alanc Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 36af17622..bd250569e 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.17 2003/10/28 23:08:43 tsi Exp $ */ /* * BIGFONT extension for sharing font metrics between clients (if possible) * and for transmitting font metrics to clients in a compressed form. diff --git a/Xext/xprint.c b/Xext/xprint.c index 9a4f2653e..29d3262f9 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -1,4 +1,3 @@ -/* $Xorg: xprint.c,v 1.5 2001/03/05 20:42:26 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -64,7 +63,6 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */ #define _XP_PRINT_SERVER_ #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/xres.c b/Xext/xres.c index 9f3624ba5..3e8231621 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -1,8 +1,6 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */ -/* $XdotOrg: xserver/xorg/Xext/xres.c,v 1.8 2006/02/11 19:16:50 alanc Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/Xext/xtest.c b/Xext/xtest.c index 6737185aa..83f8b8cc6 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/xtest.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */ -/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 7c490abca..0c7a38199 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/xvdisp.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -22,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.27 2003/07/16 01:38:31 dawes Exp $ */ /* ** File: diff --git a/Xext/xvdix.h b/Xext/xvdix.h index 99d918406..9e94e05d5 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */ #ifndef XVDIX_H #define XVDIX_H diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 422032da9..22339011c 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/xvmain.c,v 1.7 2006/02/10 22:00:20 anholt Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -22,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.15tsi Exp $ */ /* ** File: diff --git a/Xext/xvmc.c b/Xext/xvmc.c index a814f003e..737fc5dfd 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index c7eba30ad..9c019fee6 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */ #ifndef _XVMC_H #define _XVMC_H diff --git a/afb/afb.h b/afb/afb.h index e89d3a088..c05cc5511 100644 --- a/afb/afb.h +++ b/afb/afb.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.10 2003/10/29 22:15:19 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afb.h,v 5.31 94/04/17 20:28:15 dpw Exp $ */ /* Monochrome Frame Buffer definitions written by drewry, september 1986 */ diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c index 7c4502c93..594e987a8 100644 --- a/afb/afbbitblt.c +++ b/afb/afbbitblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbblt.c b/afb/afbblt.c index 9eb0227f2..9eb4e4732 100644 --- a/afb/afbblt.c +++ b/afb/afbblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.0 1996/08/18 01:45:24 dawes Exp $ */ /* * afb copy area */ @@ -31,7 +30,6 @@ in this Software without prior written authorization from the X Consortium. Author: Keith Packard */ -/* $XConsortium: afbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbbres.c b/afb/afbbres.c index 6ee09b9e4..e8f1b3b85 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -47,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 52cb62cab..4495c8cf8 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbbstore.c b/afb/afbbstore.c index a74a9d9b8..f7f1062e2 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -1,5 +1,4 @@ /* $XFree86$ */ -/* $XConsortium: afbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/afb/afbclip.c b/afb/afbclip.c index 89314f134..15be4051c 100644 --- a/afb/afbclip.c +++ b/afb/afbclip.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.2 2001/10/28 03:32:57 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbcmap.c b/afb/afbcmap.c index 5043d97a6..e3b95fbec 100644 --- a/afb/afbcmap.c +++ b/afb/afbcmap.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.0 1996/08/18 01:45:30 dawes Exp $ */ -/* $XConsortium: afbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c index 30e0bd3a5..fa685ba9a 100644 --- a/afb/afbfillarc.c +++ b/afb/afbfillarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.1 1998/03/20 21:04:54 hohndel Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,7 +25,6 @@ in this Software without prior written authorization from the X Consortium. ********************************************************/ -/* $XConsortium: afbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c index ed2e6031e..06fb37365 100644 --- a/afb/afbfillrct.c +++ b/afb/afbfillrct.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c index ffb633409..539c3457c 100644 --- a/afb/afbfillsp.c +++ b/afb/afbfillsp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.3 2000/11/22 00:58:12 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbfont.c b/afb/afbfont.c index bf77825f1..940bdb09b 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium: afbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbgc.c b/afb/afbgc.c index 6c46b3b8e..03475dda5 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.2 1999/06/20 15:02:46 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c index 3cc2e2f6e..8d1db1482 100644 --- a/afb/afbgetsp.c +++ b/afb/afbgetsp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.0 1996/08/18 01:45:37 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c index d7ddce1a1..8f332e6d8 100644 --- a/afb/afbhrzvert.c +++ b/afb/afbhrzvert.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.0 1996/08/18 01:45:38 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbimage.c b/afb/afbimage.c index a0b4270e8..c82bb3668 100644 --- a/afb/afbimage.c +++ b/afb/afbimage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c index 28113b448..de02aa46a 100644 --- a/afb/afbimggblt.c +++ b/afb/afbimggblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.1tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbline.c b/afb/afbline.c index d3f2def89..9e2e4b9f4 100644 --- a/afb/afbline.c +++ b/afb/afbline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.1 1998/03/20 21:04:55 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbmisc.c b/afb/afbmisc.c index e5a4f492d..023c43f34 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c index 72482ff7f..6801960c6 100644 --- a/afb/afbpixmap.c +++ b/afb/afbpixmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.0 1996/08/18 01:45:45 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpixmap.c,v 5.13 94/04/17 20:28:28 dpw Exp $ */ /* pixmap management written by drewry, september 1986 diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c index b7a16e086..86ec174f4 100644 --- a/afb/afbply1rct.c +++ b/afb/afbply1rct.c @@ -1,6 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /* - * $XConsortium: afbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $ * Copyright (c) 1990 X Consortium diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c index 7d4f5ddd7..289d50e1b 100644 --- a/afb/afbplygblt.c +++ b/afb/afbplygblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c index 648a2d19c..cc43f5237 100644 --- a/afb/afbpntarea.c +++ b/afb/afbpntarea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.0 1996/08/18 01:45:49 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index aaa6847a9..94c96e4cf 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -1,5 +1,4 @@ /* $XFree86$ */ -/* $XConsortium: afbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c index 4e9fa0310..a9d96edfe 100644 --- a/afb/afbpolypnt.c +++ b/afb/afbpolypnt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpolypnt.c,v 5.6 94/04/17 20:28:30 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c index c717f0e45..3dd548737 100644 --- a/afb/afbpushpxl.c +++ b/afb/afbpushpxl.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c index b9e0ba94f..2b0867fda 100644 --- a/afb/afbscrinit.c +++ b/afb/afbscrinit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.4 1998/07/25 08:50:27 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c index 3a078ffa9..adc726620 100644 --- a/afb/afbsetsp.c +++ b/afb/afbsetsp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.2 2001/08/01 00:44:47 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c index 16f6ca4ea..ba889cb80 100644 --- a/afb/afbtegblt.c +++ b/afb/afbtegblt.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.1 1998/03/20 21:04:57 hohndel Exp $ */ -/* $XConsortium: afbtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbtile.c b/afb/afbtile.c index 11d76abdf..8fcb9cde7 100644 --- a/afb/afbtile.c +++ b/afb/afbtile.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.3tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: afbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/afb/afbwindow.c b/afb/afbwindow.c index 90a4f7dfe..a4a1602bc 100644 --- a/afb/afbwindow.c +++ b/afb/afbwindow.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.0 1996/08/18 01:45:58 dawes Exp $ */ -/* $XConsortium: afbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c index 0fe9244ad..2cc30687f 100644 --- a/afb/afbzerarc.c +++ b/afb/afbzerarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.2 2001/10/28 03:32:59 tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,7 +25,6 @@ in this Software without prior written authorization from the X Consortium. ********************************************************/ -/* $XConsortium: afbzerarc.c,v 5.19 94/04/17 20:28:37 dpw Exp $ */ /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" diff --git a/cfb/cfb.h b/cfb/cfb.h index 14d6617a9..8c682ae8d 100644 --- a/cfb/cfb.h +++ b/cfb/cfb.h @@ -1,4 +1,3 @@ -/* $Xorg: cfb.h,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,7 +26,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.29tsi Exp $ */ #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) diff --git a/cfb/cfb16.h b/cfb/cfb16.h index 3d51cd142..6b5c30209 100644 --- a/cfb/cfb16.h +++ b/cfb/cfb16.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfb16.h,v 1.4 1998/11/28 10:42:50 dawes Exp $ */ /* * Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/cfb/cfb24.h b/cfb/cfb24.h index 3a99934b7..ea5fc848e 100644 --- a/cfb/cfb24.h +++ b/cfb/cfb24.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfb24.h,v 1.4 1998/11/28 10:42:51 dawes Exp $ */ /* * Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/cfb/cfb32.h b/cfb/cfb32.h index 5ea4c13c8..18a5dc1c3 100644 --- a/cfb/cfb32.h +++ b/cfb/cfb32.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfb32.h,v 1.4 1998/11/28 10:42:51 dawes Exp $ */ /* * Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c index 0bc5debbb..54a08c53d 100644 --- a/cfb/cfb8bit.c +++ b/cfb/cfb8bit.c @@ -1,4 +1,3 @@ -/* $Xorg: cfb8bit.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.4 2001/01/17 22:36:34 dawes Exp $ */ /* * cfb8bit.c diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h index 767549af7..5a17adf4f 100644 --- a/cfb/cfb8bit.h +++ b/cfb/cfb8bit.h @@ -7,7 +7,6 @@ * are used for depths other than 8. Perhaps the file should be * renamed. dpw */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.7 2001/12/14 19:59:20 dawes Exp $ */ /* @@ -34,7 +33,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfb8bit.h,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 9740c2139..8c00d9fea 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.c @@ -1,5 +1,4 @@ /* - * $Xorg: cfb8line.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium * - * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.18tsi Exp $ * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c index 68edb281b..e0ccdf4d0 100644 --- a/cfb/cfballpriv.c +++ b/cfb/cfballpriv.c @@ -1,5 +1,4 @@ /* - * $Xorg: cfballpriv.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ * Copyright 1991, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index 2e621337a..faf49b92d 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -2,7 +2,6 @@ * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.19tsi Exp $ */ /* @@ -31,7 +30,6 @@ in this Software without prior written authorization from The Open Group. Author: Keith Packard */ -/* $Xorg: cfbbitblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index db32c87e5..1e577f526 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -1,7 +1,6 @@ /* * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.13tsi Exp $ */ /* @@ -30,7 +29,6 @@ in this Software without prior written authorization from The Open Group. Author: Keith Packard */ -/* $Xorg: cfbblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ /* 24-bit bug fixes: Peter Wainwright, 1998/11/28 */ diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c index 2251fb885..fa1ee1379 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.4 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index cc27eb5dc..ee48a74ec 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.5 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c index 64adc4050..f09360ce9 100644 --- a/cfb/cfbbstore.c +++ b/cfb/cfbbstore.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.4 1999/01/31 12:21:41 dawes Exp $ */ /*- * cfbbstore.c -- * Functions required by the backing-store implementation in MI. @@ -15,7 +14,6 @@ * * */ -/* $Xorg: cfbbstore.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index a7777eda8..b96f67170 100644 --- a/cfb/cfbcmap.c +++ b/cfb/cfbcmap.c @@ -1,4 +1,3 @@ -/* $Xorg: cfbcmap.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,7 +26,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index f58682056..91b61a711 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -25,7 +25,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index a02f40e14..0eb5ff469 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.6tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: cfbfillarc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c index 657865114..4c78c24b3 100644 --- a/cfb/cfbfillrct.c +++ b/cfb/cfbfillrct.c @@ -1,7 +1,6 @@ /* * Fill rectangles. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.7 2001/01/17 22:36:35 dawes Exp $ */ /* @@ -28,7 +27,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbfillrct.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index efb462b6c..ddd4f1421 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.7tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -75,7 +74,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbfillsp.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index c20355146..a74c28c15 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.5 2001/01/17 22:36:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbgc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index 44e31a241..672196a6c 100644 --- a/cfb/cfbgetsp.c +++ b/cfb/cfbgetsp.c @@ -1,4 +1,3 @@ -/* $Xorg: cfbgetsp.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c index fda848fde..c4cba0e15 100644 --- a/cfb/cfbglblt8.c +++ b/cfb/cfbglblt8.c @@ -1,4 +1,3 @@ -/* $Xorg: cfbglblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -23,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/cfb/cfbglblt8.c,v 3.7 2003/07/16 01:38:37 dawes Exp $ */ /* * Poly glyph blt. Accepts an arbitrary font <= 32 bits wide, in Copy mode diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c index 4df991b00..a6a793055 100644 --- a/cfb/cfbhrzvert.c +++ b/cfb/cfbhrzvert.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.6 2001/10/28 03:33:00 tsi Exp $ */ /*********************************************************** Copyright 1987,1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbhrzvert.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c index 97356e8bd..1f1ce6f37 100644 --- a/cfb/cfbigblt8.c +++ b/cfb/cfbigblt8.c @@ -1,5 +1,4 @@ /* - * $Xorg: cfbigblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index f8c298922..396e1fcb2 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.12 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbimage.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbline.c b/cfb/cfbline.c index c70c48a51..84c089a73 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbline.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h index 802517aac..1d6a3f850 100644 --- a/cfb/cfbmap.h +++ b/cfb/cfbmap.h @@ -1,5 +1,4 @@ /* - * $Xorg: cfbmap.h,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1991, 1998 The Open Group @@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.11tsi Exp $ */ /* * Map names around so that multiple depths can be supported simultaneously diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c index 05954e62c..915ea35c1 100644 --- a/cfb/cfbmskbits.c +++ b/cfb/cfbmskbits.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.1 1998/10/04 09:37:46 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -28,7 +27,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $Xorg: cfbmskbits.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ /* * ========================================================================== diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index f9ce33a61..7aa446cb5 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.13tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -28,7 +27,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $Xorg: cfbmskbits.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ /* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */ #include diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index e73cf5735..d51c5187c 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: cfbpixmap.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.4 2001/01/17 22:36:36 dawes Exp $ */ /* pixmap management written by drewry, september 1986 diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index b431f33e1..ce0bcb203 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.c @@ -1,5 +1,4 @@ /* - * $Xorg: cfbply1rct.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index 9bfdfe64f..32f011e23 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.3 2005/04/20 12:25:18 daniels Exp $ */ -/* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c index 59ef0cf89..06a768e8d 100644 --- a/cfb/cfbpolypnt.c +++ b/cfb/cfbpolypnt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: cfbpolypnt.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c index 3492c8e25..857ec94a6 100644 --- a/cfb/cfbpush8.c +++ b/cfb/cfbpush8.c @@ -2,7 +2,6 @@ * Push Pixels for 8 bit displays. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.5 2001/01/17 22:36:36 dawes Exp $ */ /* @@ -28,7 +27,6 @@ Except as contained in this notice, the name of The Open Group shall 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. */ -/* $Xorg: cfbpush8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c index 9f753cdd7..485d40998 100644 --- a/cfb/cfbrctstp8.c +++ b/cfb/cfbrctstp8.c @@ -1,7 +1,6 @@ /* * Fill 32 bit stippled rectangles for 8 bit frame buffers */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -30,7 +29,6 @@ Author: Keith Packard, MIT X Consortium */ -/* $Xorg: cfbrctstp8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c index 77487bc6a..ffd813853 100644 --- a/cfb/cfbrrop.c +++ b/cfb/cfbrrop.c @@ -1,5 +1,4 @@ /* - * $Xorg: cfbrrop.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* cfb reduced rasterop computations */ diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h index 9e7a44c5b..eeb373a5e 100644 --- a/cfb/cfbrrop.h +++ b/cfb/cfbrrop.h @@ -1,5 +1,4 @@ /* - * $Xorg: cfbrrop.h,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c index 7299bbdf8..9f411ab27 100644 --- a/cfb/cfbscrinit.c +++ b/cfb/cfbscrinit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.19 2001/01/17 22:36:36 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,7 +26,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $Xorg: cfbscrinit.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index 56317cb91..a000fd9e1 100644 --- a/cfb/cfbsetsp.c +++ b/cfb/cfbsetsp.c @@ -1,4 +1,3 @@ -/* $Xorg: cfbsetsp.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c index 9f9093647..f0da05ef0 100644 --- a/cfb/cfbsolid.c +++ b/cfb/cfbsolid.c @@ -1,5 +1,4 @@ /* - * $Xorg: cfbsolid.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c index f58a07dc6..1db299623 100644 --- a/cfb/cfbteblt8.c +++ b/cfb/cfbteblt8.c @@ -3,7 +3,6 @@ * 8 bit displays, in Copy mode with no clipping. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -29,7 +28,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbteblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c index e3fb06f59..f04ee3faf 100644 --- a/cfb/cfbtegblt.c +++ b/cfb/cfbtegblt.c @@ -1,4 +1,3 @@ -/* $Xorg: cfbtegblt.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c index 96e5620b7..fb6a10613 100644 --- a/cfb/cfbtile32.c +++ b/cfb/cfbtile32.c @@ -2,7 +2,6 @@ * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.6tsi Exp $ */ /* @@ -29,7 +28,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbtile32.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c index 6c46aa4db..86a3fa5b5 100644 --- a/cfb/cfbtileodd.c +++ b/cfb/cfbtileodd.c @@ -2,7 +2,6 @@ * Fill odd tiled rectangles and spans. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.6tsi Exp $ */ /* @@ -29,7 +28,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbtileodd.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbunmap.h b/cfb/cfbunmap.h index bccdf0f0f..61c7fc942 100644 --- a/cfb/cfbunmap.h +++ b/cfb/cfbunmap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbunmap.h,v 1.6 2003/07/19 13:22:28 tsi Exp $ */ /* * Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index ebc1c4593..e04b73df2 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -1,4 +1,3 @@ -/* $Xorg: cfbwindow.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index 27b82e42e..5b8879ee1 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.4tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: cfbzerarc.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" diff --git a/cfb/stip68kgnu.h b/cfb/stip68kgnu.h index 01bb939e8..2da27b4dd 100644 --- a/cfb/stip68kgnu.h +++ b/cfb/stip68kgnu.h @@ -1,5 +1,4 @@ /* - * $Xorg: stip68kgnu.h,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.3 2001/01/17 22:36:37 dawes Exp $ */ /* * Stipple stack macro for 68k GCC diff --git a/dbe/dbe.c b/dbe/dbe.c index 9a040578e..5b43dd1bd 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dbe/dbe.c,v 1.6 2006/02/10 22:00:21 anholt Exp $ */ -/* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company @@ -31,7 +29,6 @@ * DIX DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.10 2001/08/23 14:19:24 alanh Exp $ */ /* INCLUDES */ diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 69135a837..460cc7564 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -1,4 +1,3 @@ -/* $Xorg: dbestruct.h,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company diff --git a/dbe/midbe.c b/dbe/midbe.c index cdca272d3..e687b98b7 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -1,4 +1,3 @@ -/* $Xorg: midbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company @@ -30,7 +29,6 @@ * Machine-independent DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.4 2001/03/06 17:31:34 dawes Exp $ */ /* INCLUDES */ diff --git a/dbe/midbe.h b/dbe/midbe.h index 1110578cd..1780c3fc3 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -1,4 +1,3 @@ -/* $Xorg: midbe.h,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company diff --git a/dbe/midbestr.h b/dbe/midbestr.h index 248b44857..1ad0104aa 100644 --- a/dbe/midbestr.h +++ b/dbe/midbestr.h @@ -1,4 +1,3 @@ -/* $Xorg: midbestr.h,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company diff --git a/dix/atom.c b/dix/atom.c index e6577fdd6..d9d74f1da 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.3 2001/12/14 19:59:29 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: atom.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/colormap.c b/dix/colormap.c index b8d8586b0..b8f2f4af6 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/colormap.c,v 1.13 2006/05/22 15:47:56 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: colormap.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/cursor.c b/dix/cursor.c index af9282f98..b9ede1f76 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.8 2003/01/12 02:44:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cursor.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/devices.c b/dix/devices.c index 40afac96f..15b32c648 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.20 2001/12/14 19:59:30 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -47,8 +46,6 @@ SOFTWARE. ********************************************************/ -/* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -/* $XdotOrg: xserver/xorg/dix/devices.c,v 1.11 2006/06/01 19:22:37 daniels Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/dispatch.c b/dix/dispatch.c index 72d49950b..08b015991 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/dispatch.c,v 1.14 2006/02/15 20:44:12 ajax Exp $ */ -/* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1989, 1998 The Open Group @@ -76,7 +74,6 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/dispatch.h b/dix/dispatch.h index 89ea2dd7e..dd07096af 100644 --- a/dix/dispatch.h +++ b/dix/dispatch.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.2 2001/08/01 00:44:48 tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/dix/dixfonts.c b/dix/dixfonts.c index cb0df3c30..f10011e4b 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/dixfonts.c,v 1.9 2006/02/15 20:44:12 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -49,7 +47,6 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ #define NEED_REPLIES #ifdef HAVE_DIX_CONFIG_H diff --git a/dix/dixutils.c b/dix/dixutils.c index 8cf9daa67..b35754dbb 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.13 2003/01/12 02:44:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -82,7 +81,6 @@ Author: Adobe Systems Incorporated */ -/* $Xorg: dixutils.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/events.c b/dix/events.c index 479b4d80c..f5101f629 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/events.c,v 1.18 2006/02/15 20:44:12 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -109,7 +107,6 @@ of the copyright holder. ******************************************************************/ -/* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/extension.c b/dix/extension.c index fd8727069..5ad457940 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.11 2001/12/14 19:59:31 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: extension.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/ffs.c b/dix/ffs.c index 8d0954689..e25d715dd 100644 --- a/dix/ffs.c +++ b/dix/ffs.c @@ -1,4 +1,3 @@ -/* $Xorg: ffs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/dix/gc.c b/dix/gc.c index 19036ddf3..ed6bf26db 100644 --- a/dix/gc.c +++ b/dix/gc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.9 2001/12/14 19:59:32 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: gc.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/globals.c b/dix/globals.c index d686baffa..19721062c 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/globals.c,v 1.8 2006/02/15 20:44:12 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -47,7 +45,6 @@ SOFTWARE. ********************************************************/ -/* $Xorg: globals.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c index 8f8adf5ce..c1c545fa9 100644 --- a/dix/glyphcurs.c +++ b/dix/glyphcurs.c @@ -45,7 +45,6 @@ SOFTWARE. ************************************************************************/ -/* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/grabs.c b/dix/grabs.c index 1d76f7f07..0c2b05e89 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -1,4 +1,3 @@ -/* $Xorg: grabs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/main.c b/dix/main.c index 9d66a4fa8..3fb4cdd9c 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/main.c,v 1.15 2006/02/15 20:44:12 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ /***************************************************************** diff --git a/dix/pixmap.c b/dix/pixmap.c index 1c3d49fc5..a5b7b064d 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: pixmap.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/privates.c b/dix/privates.c index 0c94ff54d..46b696416 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -1,5 +1,3 @@ -/* $Xorg: privates.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: xserver/xorg/dix/privates.c,v 1.10 2005/09/05 07:40:50 daniels Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/property.c b/dix/property.c index 35799f836..5588a90b0 100644 --- a/dix/property.c +++ b/dix/property.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: property.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/resource.c b/dix/resource.c index bb34bc9d4..39374cc8d 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -73,8 +73,6 @@ Equipment Corporation. ******************************************************************/ -/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: xserver/xorg/dix/resource.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */ /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ /* Routines to manage various kinds of resources: @@ -99,7 +97,6 @@ Equipment Corporation. * 1, and an otherwise arbitrary ID in the low 22 bits, we can create a * resource "owned" by the client. */ -/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/dix/strcasecmp.c b/dix/strcasecmp.c index bf3f0088e..58f0961e6 100644 --- a/dix/strcasecmp.c +++ b/dix/strcasecmp.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbmisc.c,v 1.4 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/swaprep.c b/dix/swaprep.c index bff404c1c..08ae6eb1a 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.7 2001/12/14 19:59:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ********************************************************/ -/* $Xorg: swaprep.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/swapreq.c b/dix/swapreq.c index 2678fb6de..a6a211515 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.4 2001/12/14 19:59:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ********************************************************/ -/* $Xorg: swapreq.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/tables.c b/dix/tables.c index d5854ef57..258ac0370 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: tables.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/window.c b/dix/window.c index 1cf14bcf5..0bcbf4608 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/window.c,v 1.17 2006/03/31 17:39:35 sandmann Exp $ */ -/* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* Copyright (c) 2006, Red Hat, Inc. @@ -100,7 +98,6 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/dix/xpstubs.c b/dix/xpstubs.c index c06a524fa..3276d9dfe 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -25,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: xpstubs.c,v 1.5 2001/03/08 17:52:08 pookie Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fb.h b/fb/fb.h index ae2ab33e6..3742cf01a 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.36tsi Exp $ * * Copyright © 1998 Keith Packard * @@ -22,7 +21,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.12 2005/08/24 11:18:33 daniels Exp $ */ #ifndef _FB_H_ #define _FB_H_ diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 92b8e1b22..572da4865 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.4 2000/08/09 17:50:51 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 75b577049..3c05ff36e 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbarc.c b/fb/fbarc.c index 98cf8796c..8f4d2960e 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbbits.c b/fb/fbbits.c index ab67b4cf3..56b58df4e 100644 --- a/fb/fbbits.c +++ b/fb/fbbits.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.5 2000/02/17 14:16:22 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbblt.c b/fb/fbblt.c index de08660e3..d176a7c27 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbbltone.c b/fb/fbbltone.c index b271318d1..f06357a37 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.11 2001/09/07 15:15:31 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbbstore.c b/fb/fbbstore.c index 01ec9b7e0..78174b6fc 100644 --- a/fb/fbbstore.c +++ b/fb/fbbstore.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.1 1999/11/19 13:53:42 hohndel Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbcmap.c b/fb/fbcmap.c index 762c51c9d..9cf5bcbf5 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -1,5 +1,3 @@ -/* $XConsortium: fbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ -/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.5 2000/09/20 00:09:13 keithp Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 3a61e975a..b1903e90b 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,6 +1,4 @@ /* - * $XdotOrg: xserver/xorg/fb/fbcompose.c,v 1.28 2006/04/19 21:56:13 keithp Exp $ - * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * 2005 Lars Knoll & Zack Rusin, Trolltech diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 73224da8f..0d1cb7faf 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.13 2003/11/10 18:21:47 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbfill.c b/fb/fbfill.c index 678c7f927..ad5025c84 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index 2a60da165..f404044c5 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index e2bb71e3a..77e4772a6 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbgc.c b/fb/fbgc.c index 21383d9a9..5b5581093 100644 --- a/fb/fbgc.c +++ b/fb/fbgc.c @@ -21,8 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xserver/xorg/fb/fbgc.c,v 1.7 2006/02/10 22:00:21 anholt Exp $ */ -/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index 7c58dcb82..f77ea8c52 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbglyph.c b/fb/fbglyph.c index b97f0c0b3..8e819401b 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -1,6 +1,4 @@ /* - * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.3 2004/12/04 00:42:50 kuhn Exp $ - * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbimage.c b/fb/fbimage.c index 174c78bd0..bf5c06b57 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fboverlay.c b/fb/fboverlay.c index e9fb9b24f..1e3d756ed 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -23,7 +22,6 @@ * Author: Keith Packard, SuSE, Inc. */ -/* $XdotOrg: xserver/xorg/fb/fboverlay.c,v 1.7 2005/07/03 07:01:23 daniels Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fboverlay.h b/fb/fboverlay.h index e6a4e033f..af0acb889 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.4tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.c b/fb/fbpict.c index 55fb0a7ba..c208643dd 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.15 2002/09/26 02:56:48 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.h b/fb/fbpict.h index 9546b134f..4ad032471 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.7 2001/07/18 10:15:02 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 1e12d8818..f79f7010d 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.9 2001/05/29 04:54:09 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbpoint.c b/fb/fbpoint.c index 5229d6970..7154b53a1 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbpush.c b/fb/fbpush.c index 8f1336963..0632766d0 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbrop.h b/fb/fbrop.h index 65f62c393..f3768a265 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ #ifndef _FBROP_H_ #define _FBROP_H_ diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 804503e12..b88375810 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -1,6 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/fb/fbscreen.c,v 1.4 2004/12/04 00:42:50 kuhn Exp $ - * Id: fbscreen.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * +/* * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbseg.c b/fb/fbseg.c index 777ff7055..d66e42468 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index eefc2da82..c59c13ceb 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbstipple.c b/fb/fbstipple.c index 175413092..ce971481e 100644 --- a/fb/fbstipple.c +++ b/fb/fbstipple.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.6 2000/02/23 20:29:47 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbtile.c b/fb/fbtile.c index ef3242241..0d0cfe174 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.3 2000/02/12 03:39:43 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbutil.c b/fb/fbutil.c index 8153ab364..4be0f233c 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 8f5355d06..968b5a61d 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/fb/fbwindow.c,v 1.11 2006/04/03 21:16:30 ajax Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * @@ -22,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index 10afbaf78..bd9998976 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -29,8 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xserver/xorg/hw/darwin/darwin.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */ #include #include diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h index 4f4e9b91f..cd572258c 100644 --- a/hw/darwin/darwin.h +++ b/hw/darwin/darwin.h @@ -23,7 +23,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */ #ifndef _DARWIN_H #define _DARWIN_H diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h index 06e7b71c5..8e914f3fd 100644 --- a/hw/darwin/darwinClut8.h +++ b/hw/darwin/darwinClut8.h @@ -1,7 +1,6 @@ /* * Darwin default 8-bit Colormap for StaticColor */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.1.8.1 2003/03/04 01:31:43 torrey Exp $ */ #ifndef _DARWIN_CLUT8_ #define _DARWIN_CLUT8_ diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c index 61100d9b3..6b902df05 100644 --- a/hw/darwin/darwinEvents.c +++ b/hw/darwin/darwinEvents.c @@ -29,7 +29,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/hw/darwin/darwinEvents.c,v 1.6 2004/03/31 22:29:09 torrey Exp $ */ #define NEED_EVENTS #include diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c index dbc449dc3..c148d96ce 100644 --- a/hw/darwin/darwinKeyboard.c +++ b/hw/darwin/darwinKeyboard.c @@ -38,7 +38,6 @@ // //============================================================================= -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.21 2004/04/01 00:05:22 torrey Exp $ */ /* =========================================================================== diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h index 0ea9c1d60..f4a861186 100644 --- a/hw/darwin/darwinKeyboard.h +++ b/hw/darwin/darwinKeyboard.h @@ -23,7 +23,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */ #ifndef DARWIN_KEYBOARD_H #define DARWIN_KEYBOARD_H 1 diff --git a/hw/darwin/darwinXinput.c b/hw/darwin/darwinXinput.c index d3716a1d4..260d72af7 100644 --- a/hw/darwin/darwinXinput.c +++ b/hw/darwin/darwinXinput.c @@ -1,4 +1,3 @@ -/* $Xorg: stubs.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* * X server support of the XINPUT extension for Darwin @@ -52,7 +51,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinXinput.c,v 1.1 2004/05/28 07:44:00 torrey Exp $ */ #define NEED_EVENTS #include diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index 7d69382af..95a7fb32c 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -33,8 +33,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */ #include #include diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h index 288063da1..27d27bc70 100644 --- a/hw/darwin/iokit/xfIOKit.h +++ b/hw/darwin/iokit/xfIOKit.h @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */ #ifndef _XFIOKIT_H #define _XFIOKIT_H diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c index 69eb41d2f..ef3e254d7 100644 --- a/hw/darwin/iokit/xfIOKitCursor.c +++ b/hw/darwin/iokit/xfIOKitCursor.c @@ -57,7 +57,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */ #include "scrnintstr.h" #include "cursorstr.h" diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c index 09c5daa1c..512793aa5 100644 --- a/hw/darwin/iokit/xfIOKitStartup.c +++ b/hw/darwin/iokit/xfIOKitStartup.c @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ #include "darwin.h" #include "darwinKeyboard.h" diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h index d8c3c2ea2..cf43758e7 100644 --- a/hw/darwin/quartz/Preferences.h +++ b/hw/darwin/quartz/Preferences.h @@ -25,7 +25,6 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.2 2003/01/15 02:34:05 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c index 0adb4c212..8697776bf 100644 --- a/hw/darwin/quartz/XDarwinStartup.c +++ b/hw/darwin/quartz/XDarwinStartup.c @@ -38,7 +38,6 @@ * dealings in this Software without prior written authorization from * Torrey T. Lyons. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include #include diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h index 828fce17f..030ccb51f 100644 --- a/hw/darwin/quartz/XServer.h +++ b/hw/darwin/quartz/XServer.h @@ -29,8 +29,6 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */ #define BOOL xBOOL #include diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index d79df4cee..6db036f1b 100644 --- a/hw/darwin/quartz/applewm.c +++ b/hw/darwin/quartz/applewm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.2 2003/09/16 00:36:13 torrey Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved. diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h index b27083ac7..60d49ef59 100644 --- a/hw/darwin/quartz/applewmExt.h +++ b/hw/darwin/quartz/applewmExt.h @@ -27,7 +27,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.2 2003/11/11 23:48:41 torrey Exp $ */ #ifndef _APPLEWMEXT_H_ #define _APPLEWMEXT_H_ diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h index 01f5b04b4..26f789da2 100644 --- a/hw/darwin/quartz/cr/XView.h +++ b/hw/darwin/quartz/cr/XView.h @@ -25,7 +25,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c index 05542eafe..a4881f9d9 100644 --- a/hw/darwin/quartz/fullscreen/fullscreen.c +++ b/hw/darwin/quartz/fullscreen/fullscreen.c @@ -25,8 +25,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2004/07/30 19:12:18 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" #include "darwin.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c index 8abce2318..e2333e2ea 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.c +++ b/hw/darwin/quartz/fullscreen/quartzCursor.c @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h index efcc4435e..57fac68a5 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.h +++ b/hw/darwin/quartz/fullscreen/quartzCursor.h @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c index 71093f5fb..ab57827d3 100644 --- a/hw/darwin/quartz/pseudoramiX.c +++ b/hw/darwin/quartz/pseudoramiX.c @@ -32,7 +32,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.4 2004/07/02 01:30:33 torrey Exp $ */ #include "pseudoramiX.h" diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h index c2943369d..df5010d1d 100644 --- a/hw/darwin/quartz/pseudoramiX.h +++ b/hw/darwin/quartz/pseudoramiX.h @@ -1,7 +1,6 @@ /* * Minimal implementation of PanoramiX/Xinerama */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.3 2004/07/02 01:30:33 torrey Exp $ */ extern int noPseudoramiXExtension; diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index 22151198a..36a8bea08 100644 --- a/hw/darwin/quartz/quartz.c +++ b/hw/darwin/quartz/quartz.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /************************************************************** * * Quartz-specific support for the Darwin X Server @@ -30,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.16 2004/07/02 01:30:33 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h index cee43325d..f1b36b6b1 100644 --- a/hw/darwin/quartz/quartz.h +++ b/hw/darwin/quartz/quartz.h @@ -30,8 +30,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */ #ifndef _QUARTZ_H #define _QUARTZ_H diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c index 2106dfad4..b477b037b 100644 --- a/hw/darwin/quartz/quartzAudio.c +++ b/hw/darwin/quartz/quartzAudio.c @@ -35,7 +35,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include "quartzCommon.h" #include "quartzAudio.h" diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h index e20c21ad2..c406bbc2a 100644 --- a/hw/darwin/quartz/quartzAudio.h +++ b/hw/darwin/quartz/quartzAudio.h @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */ #ifndef _QUARTZAUDIO_H #define _QUARTZAUDIO_H diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index 949f724c1..f5dff662c 100644 --- a/hw/darwin/quartz/quartzCommon.h +++ b/hw/darwin/quartz/quartzCommon.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /* * quartzCommon.h * @@ -32,7 +31,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.15 2004/06/08 22:58:10 torrey Exp $ */ #ifndef _QUARTZCOMMON_H #define _QUARTZCOMMON_H diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c index 711ce64f0..e2333e2ea 100644 --- a/hw/darwin/quartz/quartzCursor.c +++ b/hw/darwin/quartz/quartzCursor.c @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.4 2002/11/19 23:01:30 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h index 4db5531fa..56cc94d49 100644 --- a/hw/darwin/quartz/quartzCursor.h +++ b/hw/darwin/quartz/quartzCursor.h @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c index d2fe922d3..fc12522be 100644 --- a/hw/darwin/quartz/quartzKeyboard.c +++ b/hw/darwin/quartz/quartzKeyboard.c @@ -32,7 +32,6 @@ promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c index 536dcc336..e92fe5c79 100644 --- a/hw/darwin/quartz/quartzPasteboard.c +++ b/hw/darwin/quartz/quartzPasteboard.c @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */ #include "quartzPasteboard.h" diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h index 296c52c17..afcb6e587 100644 --- a/hw/darwin/quartz/quartzPasteboard.h +++ b/hw/darwin/quartz/quartzPasteboard.h @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */ #ifndef _QUARTZPASTEBOARD_H #define _QUARTZPASTEBOARD_H @@ -42,4 +41,4 @@ char * QuartzReadCocoaPasteboard(void); // caller must free string void QuartzWritePasteboard(); void QuartzWriteCocoaPasteboard(char *text); -#endif /* _QUARTZPASTEBOARD_H */ \ No newline at end of file +#endif /* _QUARTZPASTEBOARD_H */ diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c index cd58701b1..277e5935f 100644 --- a/hw/darwin/quartz/quartzStartup.c +++ b/hw/darwin/quartz/quartzStartup.c @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.8 2003/11/05 00:15:00 torrey Exp $ */ #include #include @@ -288,4 +287,4 @@ int DarwinModeProcessArgument( int argc, char *argv[], int i ) } return 0; -} \ No newline at end of file +} diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h index e2e97b4c8..fb6842c87 100644 --- a/hw/darwin/quartz/xpr/Xplugin.h +++ b/hw/darwin/quartz/xpr/Xplugin.h @@ -30,7 +30,6 @@ Note that these interfaces are provided solely for the use of the X11 server. Any other uses are unsupported and strongly discouraged. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */ #ifndef XPLUGIN_H #define XPLUGIN_H 1 diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index d4cd27b8f..6d9bae10f 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index c878e7d47..9aeaaa588 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h index f826167f6..cf2638a9f 100644 --- a/hw/darwin/quartz/xpr/dri.h +++ b/hw/darwin/quartz/xpr/dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h index 0df8f1890..9a3d01c9b 100644 --- a/hw/darwin/quartz/xpr/dristruct.h +++ b/hw/darwin/quartz/xpr/dristruct.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c index feffb1b9e..a7024b2da 100644 --- a/hw/darwin/quartz/xpr/x-hash.c +++ b/hw/darwin/quartz/xpr/x-hash.c @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-hash.h" #include "x-list.h" diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h index 97d4cc40c..5d4f7f93a 100644 --- a/hw/darwin/quartz/xpr/x-hash.h +++ b/hw/darwin/quartz/xpr/x-hash.h @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_HASH_H #define X_HASH_H 1 diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c index c2f1db161..b9f23928b 100644 --- a/hw/darwin/quartz/xpr/x-list.c +++ b/hw/darwin/quartz/xpr/x-list.c @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-list.h" #include diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h index 3faed5330..bd55a53d0 100644 --- a/hw/darwin/quartz/xpr/x-list.h +++ b/hw/darwin/quartz/xpr/x-list.h @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_LIST_H #define X_LIST_H 1 diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h index 5b881c725..73a88c03d 100644 --- a/hw/darwin/quartz/xpr/xpr.h +++ b/hw/darwin/quartz/xpr/xpr.h @@ -26,8 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.2 2004/04/23 19:16:52 eich Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #ifndef XPR_H #define XPR_H diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c index 2db6a2432..21746f6e9 100644 --- a/hw/darwin/quartz/xpr/xprAppleWM.c +++ b/hw/darwin/quartz/xpr/xprAppleWM.c @@ -27,7 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #include "xpr.h" #include "applewmExt.h" diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c index ee06043df..cb949dadc 100644 --- a/hw/darwin/quartz/xpr/xprCursor.c +++ b/hw/darwin/quartz/xpr/xprCursor.c @@ -30,7 +30,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "quartzCommon.h" #include "xpr.h" diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index 0dff7c56d..ed02d4b62 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -27,8 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2005/04/20 12:25:20 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #include "xpr.h" #include "rootlessCommon.h" diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index eaad13f7b..1755ca6f7 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/darwin/quartz/xpr/xprScreen.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.5 2004/09/18 00:38:30 torrey Exp $ */ /* * Xplugin rootless implementation screen functions */ @@ -28,7 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.11 2004/07/15 18:53:25 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c index 8f3340b15..d2eeca5c2 100644 --- a/hw/darwin/utils/dumpkeymap.c +++ b/hw/darwin/utils/dumpkeymap.c @@ -1,4 +1,3 @@ -// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $ //============================================================================= // // Copyright (C) 1999,2000 by Eric Sunshine diff --git a/hw/dmx/glxProxy/compsize.c b/hw/dmx/glxProxy/compsize.c index cffa1af8d..29669e318 100644 --- a/hw/dmx/glxProxy/compsize.c +++ b/hw/dmx/glxProxy/compsize.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/glx/compsize.c,v 1.3 2001/03/21 16:04:39 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/g_disptab.c b/hw/dmx/glxProxy/g_disptab.c index f507a874f..124a65511 100644 --- a/hw/dmx/glxProxy/g_disptab.c +++ b/hw/dmx/glxProxy/g_disptab.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/hw/dmx/glxProxy/g_disptab.h b/hw/dmx/glxProxy/g_disptab.h index 0b6d47be7..f02e4f59c 100644 --- a/hw/dmx/glxProxy/g_disptab.h +++ b/hw/dmx/glxProxy/g_disptab.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifndef _GLX_g_disptab_h_ #define _GLX_g_disptab_h_ diff --git a/hw/dmx/glxProxy/global.c b/hw/dmx/glxProxy/global.c index 960021a2b..0e6efeff7 100644 --- a/hw/dmx/glxProxy/global.c +++ b/hw/dmx/glxProxy/global.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index f18b1fb77..78cb34eec 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.8 2001/05/02 15:06:05 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c index 25f8c5d65..3404d557a 100644 --- a/hw/dmx/glxProxy/glxcmdsswap.c +++ b/hw/dmx/glxProxy/glxcmdsswap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxcontext.h b/hw/dmx/glxProxy/glxcontext.h index 465101a97..d59df3f0c 100644 --- a/hw/dmx/glxProxy/glxcontext.h +++ b/hw/dmx/glxProxy/glxcontext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_context_h_ #define _GLX_context_h_ diff --git a/hw/dmx/glxProxy/glxdrawable.h b/hw/dmx/glxProxy/glxdrawable.h index 6e00ad62f..59fffa747 100644 --- a/hw/dmx/glxProxy/glxdrawable.h +++ b/hw/dmx/glxProxy/glxdrawable.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_drawable_h_ #define _GLX_drawable_h_ diff --git a/hw/dmx/glxProxy/glxerror.h b/hw/dmx/glxProxy/glxerror.h index d75cc2b2e..f69cadbde 100644 --- a/hw/dmx/glxProxy/glxerror.h +++ b/hw/dmx/glxProxy/glxerror.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_error_h_ #define _GLX_error_h_ diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c index 872cfaf17..136a79de4 100644 --- a/hw/dmx/glxProxy/glxext.c +++ b/hw/dmx/glxProxy/glxext.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.7 2001/03/21 16:29:36 dawes Exp $ ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the ** License. You may obtain a copy of the License at Silicon Graphics, Inc., diff --git a/hw/dmx/glxProxy/glxext.h b/hw/dmx/glxProxy/glxext.h index 7e6756f86..8572aa43a 100644 --- a/hw/dmx/glxProxy/glxext.h +++ b/hw/dmx/glxProxy/glxext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.4 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _glxext_h_ #define _glxext_h_ diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c index 2f6359553..4ddd4762c 100644 --- a/hw/dmx/glxProxy/glxscreens.c +++ b/hw/dmx/glxProxy/glxscreens.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.6 2001/03/21 16:29:36 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxscreens.h b/hw/dmx/glxProxy/glxscreens.h index 22d397171..5f93e497b 100644 --- a/hw/dmx/glxProxy/glxscreens.h +++ b/hw/dmx/glxProxy/glxscreens.h @@ -1,7 +1,6 @@ #ifndef _GLX_screens_h_ #define _GLX_screens_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxserver.h b/hw/dmx/glxProxy/glxserver.h index 2b4ed0a69..db5be4365 100644 --- a/hw/dmx/glxProxy/glxserver.h +++ b/hw/dmx/glxProxy/glxserver.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef _GLX_server_h_ #define _GLX_server_h_ diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index e353263a7..27a27c335 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c index 0893f1523..f30b05fb1 100644 --- a/hw/dmx/glxProxy/glxutil.c +++ b/hw/dmx/glxProxy/glxutil.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxutil.h b/hw/dmx/glxProxy/glxutil.h index 176444ee9..94ca7da95 100644 --- a/hw/dmx/glxProxy/glxutil.h +++ b/hw/dmx/glxProxy/glxutil.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef _glxcmds_h_ #define _glxcmds_h_ diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c index 4259974f9..e55f80252 100644 --- a/hw/dmx/glxProxy/glxvendor.c +++ b/hw/dmx/glxProxy/glxvendor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/hw/dmx/glxProxy/render2swap.c b/hw/dmx/glxProxy/render2swap.c index 3fb894325..e7cbff21f 100644 --- a/hw/dmx/glxProxy/render2swap.c +++ b/hw/dmx/glxProxy/render2swap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/renderpixswap.c b/hw/dmx/glxProxy/renderpixswap.c index bedefe781..881967ccf 100644 --- a/hw/dmx/glxProxy/renderpixswap.c +++ b/hw/dmx/glxProxy/renderpixswap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/unpack.h b/hw/dmx/glxProxy/unpack.h index abad7b147..713e3aaa2 100644 --- a/hw/dmx/glxProxy/unpack.h +++ b/hw/dmx/glxProxy/unpack.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef __GLX_unpack_h__ #define __GLX_unpack_h__ diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c index 7a6bb11fc..a2fb07f1e 100644 --- a/hw/dmx/input/dmxeq.c +++ b/hw/dmx/input/dmxeq.c @@ -1,6 +1,5 @@ /* $XFree86$ */ /* - * $Xorg: mieq.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ * * Copyright 1990, 1998 The Open Group * diff --git a/hw/kdrive/ati/ati_dripriv.h b/hw/kdrive/ati/ati_dripriv.h index 1343f07f5..f0e139383 100644 --- a/hw/kdrive/ati/ati_dripriv.h +++ b/hw/kdrive/ati/ati_dripriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dripriv.h,v 1.3 2000/11/18 19:37:11 tsi Exp $ */ /* * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, * Precision Insight, Inc., Cedar Park, Texas, and diff --git a/hw/kdrive/ati/r128_common.h b/hw/kdrive/ati/r128_common.h index 506f97c68..862fea599 100644 --- a/hw/kdrive/ati/r128_common.h +++ b/hw/kdrive/ati/r128_common.h @@ -31,7 +31,6 @@ * Converted to common header format: * Jens Owen * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_common.h,v 1.2 2002/12/16 16:19:10 dawes Exp $ * */ diff --git a/hw/kdrive/ati/r128_sarea.h b/hw/kdrive/ati/r128_sarea.h index b73797ae6..6fbd05ecb 100644 --- a/hw/kdrive/ati/r128_sarea.h +++ b/hw/kdrive/ati/r128_sarea.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h,v 1.7 2002/02/16 21:26:35 herrb Exp $ */ /* * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, * Precision Insight, Inc., Cedar Park, Texas, and diff --git a/hw/kdrive/ati/radeon_common.h b/hw/kdrive/ati/radeon_common.h index 2539ba68f..6c416c6b1 100644 --- a/hw/kdrive/ati/radeon_common.h +++ b/hw/kdrive/ati/radeon_common.h @@ -31,7 +31,6 @@ * Converted to common header format: * Jens Owen * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.2 2003/04/07 01:22:09 martin Exp $ * */ diff --git a/hw/kdrive/ati/radeon_sarea.h b/hw/kdrive/ati/radeon_sarea.h index 82a72ed19..1d39bca52 100644 --- a/hw/kdrive/ati/radeon_sarea.h +++ b/hw/kdrive/ati/radeon_sarea.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h,v 1.5 2002/10/30 12:52:14 alanh Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, * VA Linux Systems Inc., Fremont, California. diff --git a/hw/kdrive/pm2/glint_regs.h b/hw/kdrive/pm2/glint_regs.h index 269b05fbe..84f220298 100644 --- a/hw/kdrive/pm2/glint_regs.h +++ b/hw/kdrive/pm2/glint_regs.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36tsi Exp $ */ /* * glint register file diff --git a/hw/kdrive/sis300/sis_reg.h b/hw/kdrive/sis300/sis_reg.h index 2b305ff04..6e5a8f6d5 100644 --- a/hw/kdrive/sis300/sis_reg.h +++ b/hw/kdrive/sis300/sis_reg.h @@ -25,7 +25,6 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_reg.h,v 1.3 2000/09/26 15:56:48 tsi Exp $ */ /* * Authors: diff --git a/hw/kdrive/smi/smi.c b/hw/kdrive/smi/smi.c index 96c774aac..7d4d725c7 100644 --- a/hw/kdrive/smi/smi.c +++ b/hw/kdrive/smi/smi.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smi.c,v 1.11 2002/10/18 06:31:17 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/hw/kdrive/smi/smi.h b/hw/kdrive/smi/smi.h index 93b856939..19fdcbad4 100644 --- a/hw/kdrive/smi/smi.h +++ b/hw/kdrive/smi/smi.h @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smi.h,v 1.6 2001/07/24 19:06:03 keithp Exp $ */ #ifndef _SMI_H_ #define _SMI_H_ diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c index 4e1a9fd45..06606ad1b 100644 --- a/hw/kdrive/smi/smidraw.c +++ b/hw/kdrive/smi/smidraw.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smidraw.c,v 1.7 2001/07/24 19:06:03 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/hw/kdrive/smi/smidraw.h b/hw/kdrive/smi/smidraw.h index 3ec0831fc..f91b68c56 100644 --- a/hw/kdrive/smi/smidraw.h +++ b/hw/kdrive/smi/smidraw.h @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.h,v 1.1 2001/06/03 18:48:19 keithp Exp $ */ #ifndef _SMIDRAW_H_ #define _SMIDRAW_H_ diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c index 5770e2a6f..e0f33fe6f 100644 --- a/hw/kdrive/smi/smistub.c +++ b/hw/kdrive/smi/smistub.c @@ -22,7 +22,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smistub.c,v 1.4 2002/10/08 21:25:35 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/hw/kdrive/smi/smivideo.c b/hw/kdrive/smi/smivideo.c index 32c73516a..46593a0ee 100644 --- a/hw/kdrive/smi/smivideo.c +++ b/hw/kdrive/smi/smivideo.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.10 2003/04/23 21:51:18 tsi Exp $ */ #ifdef HAVE_CONFIG_H #include #endif diff --git a/hw/kdrive/src/fourcc.h b/hw/kdrive/src/fourcc.h index b19f5decc..54be7ebe8 100644 --- a/hw/kdrive/src/fourcc.h +++ b/hw/kdrive/src/fourcc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/fourcc.h,v 1.4 2003/04/23 21:51:24 tsi Exp $ */ /* This header file contains listings of STANDARD guids for video formats. diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 23d404df5..773c45420 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -1,4 +1,3 @@ -/* $Xorg: InitInput.c,v 1.4 2001/02/09 02:04:44 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 46e956ca1..b8253f607 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -1,4 +1,3 @@ -/* $Xorg: InitOutput.c,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/vfb/lk201kbd.h b/hw/vfb/lk201kbd.h index 9b4090ed0..d0198d06b 100644 --- a/hw/vfb/lk201kbd.h +++ b/hw/vfb/lk201kbd.h @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: lk201kbd.h,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ */ #define MIN_LK201_KEY 86 #define MAX_LK201_KEY 251 diff --git a/hw/xfree86/common/atKeynames.h b/hw/xfree86/common/atKeynames.h index d37f5b0f0..1415fce20 100644 --- a/hw/xfree86/common/atKeynames.h +++ b/hw/xfree86/common/atKeynames.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.21 2003/10/09 11:43:59 pascal Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 754ad7c77..fb6668ba0 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.106 2004/02/02 03:55:28 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/common/fourcc.h b/hw/xfree86/common/fourcc.h index e60aa4e83..853657e86 100644 --- a/hw/xfree86/common/fourcc.h +++ b/hw/xfree86/common/fourcc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/fourcc.h,v 1.5 2003/08/24 17:36:48 dawes Exp $ */ /* * Copyright (c) 2000-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/scoasm.h b/hw/xfree86/common/scoasm.h index 5a5af8eb9..8f80e7b1e 100644 --- a/hw/xfree86/common/scoasm.h +++ b/hw/xfree86/common/scoasm.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/scoasm.h,v 3.1 2003/08/24 17:36:49 dawes Exp $ */ /* * Copyright (c) 1996 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 87ae55143..2f6aeac55 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.173 2004/01/27 01:31:44 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index be07ec9d4..f0a41c67c 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -32,7 +32,6 @@ * Author: David Dawes . */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.2 2003/11/03 05:11:01 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index 96da6e6a9..ea86c1cf3 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.h,v 1.23 2003/08/24 17:36:50 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index b932908d7..4d933aa9d 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.32 2006/06/01 19:53:06 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index 77b25ed32..0786ec6fe 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.h,v 1.7 2003/10/08 14:58:27 dawes Exp $ */ /* * Copyright (c) 1997-2000 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index a0d622a33..f0efa625e 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */ /* * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. * diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 787c39de8..14e0fcd91 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.37 2003/11/07 22:20:17 dawes Exp $ */ /* * Copyright (c) 1994-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 53186ea3b..55c85e630 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DGA.c,v 1.8 2006/02/15 20:44:13 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 001c3d4bf..3aa83e882 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.11 2003/11/11 21:02:28 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DPMS.c,v 1.8 2005/07/03 08:53:42 daniels Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index 4b65d2c1f..978c4fa15 100644 --- a/hw/xfree86/common/xf86Date.h +++ b/hw/xfree86/common/xf86Date.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.4 2004/08/16 22:48:50 kem Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */ /* * Copyright (c) 2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index 5579cde5b..2eb28876d 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Debug.c,v 1.7 2003/09/24 02:43:17 dawes Exp $ */ /* * Copyright (c) 2000-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c index 28064cb71..fc0a9f4eb 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoProbe.c,v 1.14 2003/10/29 04:17:21 dawes Exp $ */ /* * Copyright (c) 1999-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index c63ef1c3a..746ff70e7 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoScanPci.c,v 1.15 2003/09/23 06:43:46 dawes Exp $ */ /* * Copyright (c) 1999-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 1e0ac7996..745c06379 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.42 2004/01/27 01:31:44 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index ebc460f30..b3978f7bf 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.136 2004/01/27 01:31:45 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index a14e9e7bb..58c18904e 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86InPriv.h,v 1.5 2003/08/24 17:36:52 dawes Exp $ */ /* * Copyright (c) 1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 993918426..d045c0676 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.36 2006/06/01 18:47:01 daniels Exp $ */ /* * Loosely based on code bearing the following copyright: diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index 318b24584..86ac74522 100644 --- a/hw/xfree86/common/xf86Io.c +++ b/hw/xfree86/common/xf86Io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.56 2003/11/03 05:11:02 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * @@ -49,7 +48,6 @@ */ /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Io.c,v 1.6 2006/03/25 19:52:03 ajax Exp $ */ #define NEED_EVENTS #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/common/xf86Kbd.c b/hw/xfree86/common/xf86Kbd.c index 85f9e3406..a86581c25 100644 --- a/hw/xfree86/common/xf86Kbd.c +++ b/hw/xfree86/common/xf86Kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c,v 3.26 2003/08/24 17:36:53 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/common/xf86KbdBSD.c b/hw/xfree86/common/xf86KbdBSD.c index c1f6156e3..97a737db1 100644 --- a/hw/xfree86/common/xf86KbdBSD.c +++ b/hw/xfree86/common/xf86KbdBSD.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.22 2003/10/07 22:00:52 herrb Exp $ */ /* * Derived from xf86Kbd.c by S_ren Schmidt (sos@login.dkuug.dk) * which is Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. diff --git a/hw/xfree86/common/xf86KbdLnx.c b/hw/xfree86/common/xf86KbdLnx.c index c5361f5d9..74cb42d0f 100644 --- a/hw/xfree86/common/xf86KbdLnx.c +++ b/hw/xfree86/common/xf86KbdLnx.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c,v 3.17 2003/08/24 17:36:53 dawes Exp $ */ /* * Linux version of keymapping setup. The kernel (since 0.99.14) has support * for fully remapping the keyboard, but there are some differences between diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index 89c23c24a..82e3c720e 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */ /* ***************************************************************************** * HISTORY diff --git a/hw/xfree86/common/xf86Keymap.h b/hw/xfree86/common/xf86Keymap.h index f0998ba9b..5299badb3 100644 --- a/hw/xfree86/common/xf86Keymap.h +++ b/hw/xfree86/common/xf86Keymap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.20 2003/08/24 17:36:53 dawes Exp $ */ /* * Copyright (c) 1994-2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index bdb02cef0..7596fbea7 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v 1.16 2003/11/03 05:11:02 tsi Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 36e81559e..b892e3e6a 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Mode.c,v 1.10 2006/03/07 16:00:57 libv Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index a32569980..f54be49e6 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v 1.37 2003/08/24 17:36:54 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h index 718732353..dbb98da03 100644 --- a/hw/xfree86/common/xf86Opt.h +++ b/hw/xfree86/common/xf86Opt.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Opt.h,v 1.15 2003/10/08 14:30:38 dawes Exp $ */ /* * Copyright (c) 1998-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index d3e38b17d..0a4c11d8d 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Option.c,v 1.29 2003/10/18 12:34:19 dawes Exp $ */ /* * Copyright (c) 1998-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index 0262be3df..ac8896879 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PM.c,v 3.9 2003/08/24 17:36:54 dawes Exp $ */ /* * Copyright (c) 2000-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index c18d512a9..b8ba73f6a 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.156 2003/10/30 15:26:33 tsi Exp $ */ /* * Copyright (c) 1995-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index f97bbb352..e7c0a9f67 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.83 2004/01/27 01:31:45 dawes Exp $ */ /* * Copyright (c) 1997-2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index a35de2065..a01b07fd7 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.41 2004/01/27 01:31:45 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 56496ab8f..288d72193 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,6 +1,4 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86RandR.c,v 1.25 2005/10/30 17:38:49 twini Exp $ */ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Resources.h b/hw/xfree86/common/xf86Resources.h index ce2c62bb3..97bf817fe 100644 --- a/hw/xfree86/common/xf86Resources.h +++ b/hw/xfree86/common/xf86Resources.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Resources.h,v 1.15 2003/08/24 17:36:55 dawes Exp $ */ /* * Copyright (c) 1999-2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index 45746bc90..f7ac89b1b 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */ /* * Copyright (c) 1994-2003 by The XFree86 Project, Inc. @@ -59,4 +57,3 @@ #endif /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ diff --git a/hw/xfree86/common/xf86Versions.c b/hw/xfree86/common/xf86Versions.c index 881de1372..e984e80c1 100644 --- a/hw/xfree86/common/xf86Versions.c +++ b/hw/xfree86/common/xf86Versions.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Versions.c,v 1.2 2003/08/24 20:01:19 dawes Exp $ */ /* * Copyright (c) 2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 272665ba3..fb9151346 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86VidMode.c,v 1.17 2003/08/24 17:36:55 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86XKB.c b/hw/xfree86/common/xf86XKB.c index 68be17c3a..399eb02d9 100644 --- a/hw/xfree86/common/xf86XKB.c +++ b/hw/xfree86/common/xf86XKB.c @@ -51,7 +51,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * authorization from the copyright holder(s) and author(s). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.12 2003/08/24 17:36:55 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index a931a5d60..c56475b12 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 3.70 2003/11/03 05:11:02 tsi Exp $ */ /* * Copyright 1995-1999 by Frederic Lepied, France. * @@ -48,7 +47,6 @@ * authorization from the copyright holder(s) and author(s). */ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Xinput.c,v 1.8 2006/03/24 20:50:13 fredrik Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 9fb30413a..20bf0a9e1 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -49,7 +49,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h,v 3.36 2003/08/24 17:36:55 dawes Exp $ */ #ifndef _xf86Xinput_h #define _xf86Xinput_h diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index 1ee241d0b..ea6a26dcd 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86cmap.c,v 1.9 2005/09/05 07:43:51 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h index 4291b971a..b98bd3bfd 100644 --- a/hw/xfree86/common/xf86cmap.h +++ b/hw/xfree86/common/xf86cmap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.h,v 1.9 2003/10/17 20:02:12 alanh Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index cf8de47f6..102f6b1b2 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbBus.c,v 1.3 2003/08/24 17:36:55 dawes Exp $ */ /* * Copyright (c) 2000-2001 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index c3eadac1f..8141a8373 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.c,v 1.28 2003/11/03 05:11:03 tsi Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index adb26a1f1..4f2eac5e6 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.h,v 1.14 2003/10/09 12:40:54 alanh Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index 049dcda5f..3abad38ef 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c,v 3.6 2003/08/24 17:36:55 dawes Exp $ */ /* * Copyright (c) 1997-2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 52e8a194c..0e3e3cc6b 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86noBus.c,v 1.2 2003/08/24 17:36:55 dawes Exp $ */ /* * Copyright (c) 2000-2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 844496618..b763042cc 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.77 2003/11/03 05:11:03 tsi Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h index 75d82fbcf..90d9dd9b9 100644 --- a/hw/xfree86/common/xf86pciBus.h +++ b/hw/xfree86/common/xf86pciBus.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.h,v 3.10 2003/08/24 17:36:56 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 4e84729fb..2e06ffac4 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -20,7 +20,6 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 81c1b84ac..8576409d4 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -20,7 +20,6 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */ #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 70e32616c..0c33afba2 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.97 2003/10/30 17:36:56 tsi Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index a7cbd0e26..89cb6bac4 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -28,7 +28,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h index fbe60cb48..e0feb57b8 100644 --- a/hw/xfree86/common/xf86xv.h +++ b/hw/xfree86/common/xf86xv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.h,v 1.25 2003/08/24 17:36:56 dawes Exp $ */ /* * Copyright (c) 1998-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index 7dc4e9dfc..f8ff0bed4 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvmc.c,v 1.6 2003/10/08 22:31:59 mvojkovi Exp $ */ /* * Copyright (c) 2001-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86xvmc.h b/hw/xfree86/common/xf86xvmc.h index 0b073aac8..bc7a98c6a 100644 --- a/hw/xfree86/common/xf86xvmc.h +++ b/hw/xfree86/common/xf86xvmc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvmc.h,v 1.7 2003/10/08 22:31:59 mvojkovi Exp $ */ /* * Copyright (c) 2001 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h index 0d1efdafb..ced053679 100644 --- a/hw/xfree86/common/xf86xvpriv.h +++ b/hw/xfree86/common/xf86xvpriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvpriv.h,v 1.2 2003/08/24 17:36:56 dawes Exp $ */ /* * Copyright (c) 2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 916066005..88506f659 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -24,7 +24,6 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.5 2000/11/06 19:24:07 dawes Exp $ */ /* X Input Serial Buffer routines for use in any XInput driver that accesses diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index d5e0fc159..7f9dd507a 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index 47005320a..f627e87a5 100644 --- a/hw/xfree86/common/xorgVersion.h +++ b/hw/xfree86/common/xorgVersion.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.3 2004/08/16 02:07:53 kem Exp $ */ /* * Copyright (c) 2004, X.Org Foundation @@ -48,4 +47,3 @@ # define XORG_VERSION_SNAP XORG_GET_SNAP_VERSION(XORG_VERSION_CURRENT) #endif -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.3 2004/08/16 02:07:53 kem Exp $ */ diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 00e721053..22deca687 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -3,7 +3,6 @@ * * Copyright 1999 by Andrew C Aitchison */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index 6d3b18c13..3ebafbbba 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.3 2000/11/03 18:46:08 eich Exp $ */ /* edid.c: retrieve EDID record from raw DDC1 data stream: data * is contained in an array of unsigned int each unsigned int diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index 9182fbdb0..30499a6da 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.6 2000/04/17 16:29:55 eich Exp $ */ /* edid.h: defines to parse an EDID block * diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index 718cbf77a..a16055491 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */ /* interpret_edid.c: interpret a primary EDID block * diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c index c21bac17a..3a17e2f33 100644 --- a/hw/xfree86/ddc/interpret_vdif.c +++ b/hw/xfree86/ddc/interpret_vdif.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 609738ad9..30b607d4f 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.15 2001/05/22 17:01:23 tsi Exp $ */ /* print_edid.c: print out all information retrieved from display device * diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c index ededa21b2..13cd3abad 100644 --- a/hw/xfree86/ddc/print_vdif.c +++ b/hw/xfree86/ddc/print_vdif.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 5c129aef0..1777b68a7 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */ #ifndef _VDIF_H #define _VDIF_H diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index 8c7c67164..fb1083606 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */ /* xf86DDC.h * diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index eb9791098..5e424afb2 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */ #ifndef __DGAPROC_H #define __DGAPROC_H diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 4f7a23e3a..bb68bcb9d 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.3 2005/04/20 12:25:13 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h index 918d1e4df..c5ad03af2 100644 --- a/hw/xfree86/dixmods/extmod/vidmodeproc.h +++ b/hw/xfree86/dixmods/extmod/vidmodeproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.4 1999/12/13 01:39:40 robin Exp $ */ /* Prototypes for DGA functions that the DDX must provide */ diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c index 9979bfb30..0736167f8 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga.c +++ b/hw/xfree86/dixmods/extmod/xf86dga.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.21 2000/06/30 19:06:54 keithp Exp $ */ /* diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 1f52d7416..fa9530860 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -3,7 +3,6 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c index 3ce3c4266..3a6f83eca 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.41 2003/11/17 22:20:27 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h index 87a251767..93b193ca7 100644 --- a/hw/xfree86/dixmods/extmod/xf86miscproc.h +++ b/hw/xfree86/dixmods/extmod/xf86miscproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.5 2002/11/20 04:04:58 dawes Exp $ */ /* Prototypes for Pointer/Keyboard functions that the DDX must provide */ diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index bcd08bf90..44ec9f11d 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.58 2003/11/06 18:37:57 tsi Exp $ */ /* @@ -29,8 +28,6 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ -/* $XdotOrg: xserver/xorg/hw/xfree86/dixmods/extmod/xf86vmode.c,v 1.9 2006/02/10 22:00:24 anholt Exp $ */ -/* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 7899f3a75..7c1450c7a 100644 --- a/hw/xfree86/dixmods/extmod/xvmod.c +++ b/hw/xfree86/dixmods/extmod/xvmod.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h index b284e3f4e..81356a149 100644 --- a/hw/xfree86/dixmods/extmod/xvmodproc.h +++ b/hw/xfree86/dixmods/extmod/xvmodproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/dixmods/xkbKillSrv.c index ee19454b0..415873ad0 100644 --- a/hw/xfree86/dixmods/xkbKillSrv.c +++ b/hw/xfree86/dixmods/xkbKillSrv.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxKillSrv.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c index b986432d5..e6d4f0fc0 100644 --- a/hw/xfree86/dixmods/xkbPrivate.c +++ b/hw/xfree86/dixmods/xkbPrivate.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xfree86/dixmods/xkbVT.c b/hw/xfree86/dixmods/xkbVT.c index c637d5545..a1cdc7016 100644 --- a/hw/xfree86/dixmods/xkbVT.c +++ b/hw/xfree86/dixmods/xkbVT.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxVT.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 462b9ad44..7b4d5bda4 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.39 2003/11/10 18:21:41 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 312e8a8bb..b49c426eb 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index 6dc86d5c4..340c59a2e 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.12 2002/10/30 12:52:03 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h index 77c16e0ef..a0d6084f3 100644 --- a/hw/xfree86/dri/sarea.h +++ b/hw/xfree86/dri/sarea.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ /** * \file sarea.h * SAREA definitions. @@ -34,7 +33,6 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ #ifndef _SAREA_H_ #define _SAREA_H_ diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 5e460361b..d14b3d800 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.12 2002/12/14 01:36:08 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h index ca27e43d1..b70b5d0b4 100644 --- a/hw/xfree86/dummylib/dummylib.h +++ b/hw/xfree86/dummylib/dummylib.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index d7c613122..1d061d433 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 516380707..26868e7c8 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 7131dc5e6..b671d4dde 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index 86b8d5243..32789ecbb 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index 13c8c0bc5..b77948d0c 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index 1320117fc..5ecd99e4d 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 41ebbee21..9834c613b 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 398d0b3c3..94f030719 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index 08cb5da80..ea5bb3560 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index ffad8c7cb..4467af9d5 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index e46c00b69..1b7bca9c6 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index cfc3fcdb6..741a4b341 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */ #ifndef _FBDEVHW_H_ #define _FBDEVHW_H_ diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index 80bccc8db..56ba92901 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index a18b84345..4c08ec15d 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -2,7 +2,6 @@ * copyed from from linux kernel 2.2.4 * removed internal stuff (#ifdef __KERNEL__) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c index 742645bba..110563ed9 100644 --- a/hw/xfree86/i2c/fi1236.c +++ b/hw/xfree86/i2c/fi1236.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.9 2006/02/10 22:00:25 anholt Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index 9049fe4fd..53382a859 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -6,7 +6,6 @@ * (c) 1998 Gerd Knorr */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index 81765e4a9..76d2ebf92 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -2,7 +2,6 @@ * Copyright (C) 1998 Itai Nahshon, Michael Schimek */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */ #ifndef _XF86I2C_H #define _XF86I2C_H diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 1b4475f21..46a1179de 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.28 2003/09/08 14:25:30 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 4ffd74b39..734d84720 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.26 2003/11/06 18:38:12 tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index b84571302..c62377ca8 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.25 2002/09/16 18:06:08 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c index 520df1495..7ef6328da 100644 --- a/hw/xfree86/int10/pci.c +++ b/hw/xfree86/int10/pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.11 2001/10/01 13:44:13 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index 35b74cd42..58b65782c 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.2 2000/02/12 03:39:57 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index 303cf8925..d74643eaf 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.10tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index 47f965d74..ec4fbd67f 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.23 2002/04/04 14:05:51 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index 62a34e3aa..83663b0e6 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.11 2001/04/30 14:34:58 tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h index a7eb6d3c7..4af2dafb7 100644 --- a/hw/xfree86/int10/xf86x86emu.h +++ b/hw/xfree86/int10/xf86x86emu.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.1 2000/01/23 04:44:35 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h index 13cc2f3e0..b50313607 100644 --- a/hw/xfree86/os-support/assyntax.h +++ b/hw/xfree86/os-support/assyntax.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/assyntax.h,v 3.13 2003/08/24 17:37:03 dawes Exp $ */ #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 518deaa1e..5052b7862 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.6 2003/12/30 15:18:30 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index bdc2e0a2b..4a3d5ca52 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.1tsi Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index 0ecd6f64f..37749c913 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.6 2001/02/16 14:45:10 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index d97782dc6..00591d135 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.5.4.3 1998/06/05 16:23:03 dawes Exp $ */ /* * Derived from VTsw_usl.c which is * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index 00b928a5e..51ffef148 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,4 +1,3 @@ -/* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index 62952a343..b2141192e 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 4d883a2be..eb6d85053 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.21 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index 6e288d43f..b433d7ba3 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.22 2002/05/18 21:15:16 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 895d64e15..b5b91b0c7 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -23,7 +23,6 @@ /* Modified for FreeBSD by David Dawes */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 4b4ba3af3..65d577eb8 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.8 2003/11/04 03:16:58 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.h b/hw/xfree86/os-support/bsd/bsd_kbd.h index c042d88bf..b2ae179e1 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.h +++ b/hw/xfree86/os-support/bsd/bsd_kbd.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index 5215d54e4..0a0434f2a 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c,v 1.5 2002/07/30 23:24:32 herrb Exp $ */ /* * Copyright (C) 2001 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index f54c7d7a5..21fe1ff18 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c,v 1.28 2004/02/06 17:15:36 tsi Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 8668396e0..f4ea3f5c9 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.4 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index 0ac1a63bc..df5a9d2f6 100644 --- a/hw/xfree86/os-support/bsd/libusb/data.c +++ b/hw/xfree86/os-support/bsd/libusb/data.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index 2306d2f58..bbcb55853 100644 --- a/hw/xfree86/os-support/bsd/libusb/descr.c +++ b/hw/xfree86/os-support/bsd/libusb/descr.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index feff9779a..c68ccb524 100644 --- a/hw/xfree86/os-support/bsd/libusb/parse.c +++ b/hw/xfree86/os-support/bsd/libusb/parse.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index f909ee691..a8a5f650e 100644 --- a/hw/xfree86/os-support/bsd/libusb/usage.c +++ b/hw/xfree86/os-support/bsd/libusb/usage.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h index 69ef79a62..fedd3e545 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb.h +++ b/hw/xfree86/os-support/bsd/libusb/usb.h @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ #define _DIAGASSERT(e) assert(e) diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h index cb0bf33ec..db2cae171 100644 --- a/hw/xfree86/os-support/bsd/libusb/usbvar.h +++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usbvar.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ struct report_desc { unsigned int size; diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index d53f615bb..ae65c8f15 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -1,4 +1,3 @@ -/* $XFree86: ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index dfd5d9f54..0cb9d4d56 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -1,4 +1,3 @@ -/* $XFree86: sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bus/460gxPCI.c b/hw/xfree86/os-support/bus/460gxPCI.c index 255dfa12f..44ee97687 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.c +++ b/hw/xfree86/os-support/bus/460gxPCI.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/460gxPCI.c,v 1.4 2003/08/29 21:08:06 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/460gxPCI.h b/hw/xfree86/os-support/bus/460gxPCI.h index 65a19b2f0..2905d4787 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.h +++ b/hw/xfree86/os-support/bus/460gxPCI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/460gxPCI.h,v 1.1 2003/01/02 18:12:48 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index 15006e179..ea6ac4ec0 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.82 2004/01/16 15:39:04 tsi Exp $ */ /* * Pci.c - New server PCI access functions * diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index a91c6b27d..0f1af2086 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.45 2004/02/02 03:55:31 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index 22d84be17..c864e3385 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -20,7 +20,6 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 660f008e1..9acc4ab5b 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/e8870PCI.c b/hw/xfree86/os-support/bus/e8870PCI.c index 65b0c0474..8e0f95ac0 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.c +++ b/hw/xfree86/os-support/bus/e8870PCI.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/e8870PCI.c,v 1.2 2003/07/17 15:08:22 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/e8870PCI.h b/hw/xfree86/os-support/bus/e8870PCI.h index 9efa0ed6d..89726270a 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.h +++ b/hw/xfree86/os-support/bus/e8870PCI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/e8870PCI.h,v 1.1 2003/02/23 20:26:49 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c index 2868dafa7..61cb405a8 100644 --- a/hw/xfree86/os-support/bus/freebsdPci.c +++ b/hw/xfree86/os-support/bus/freebsdPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c index b091ec425..fd7bdf6c8 100644 --- a/hw/xfree86/os-support/bus/ix86Pci.c +++ b/hw/xfree86/os-support/bus/ix86Pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c,v 1.25 2003/09/24 02:43:34 dawes Exp $ */ /* * ix86Pci.c - x86 PCI driver * diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 7f6376a3a..a3c07f330 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.9 2002/09/24 16:14:16 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/netbsdPci.c b/hw/xfree86/os-support/bus/netbsdPci.c index 7dbbfdec7..ee52c89cc 100644 --- a/hw/xfree86/os-support/bus/netbsdPci.c +++ b/hw/xfree86/os-support/bus/netbsdPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/netbsdPci.c,v 1.4 2003/08/24 17:37:04 dawes Exp $ */ /* * Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c index 3e5ea3187..49c1a2a39 100644 --- a/hw/xfree86/os-support/bus/ppcPci.c +++ b/hw/xfree86/os-support/bus/ppcPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.8 2002/07/24 19:06:52 tsi Exp $ */ /* * ppcPci.c - PowerPC PCI access functions * diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c index 5e0ef5b18..5dd6b9369 100644 --- a/hw/xfree86/os-support/bus/sparcPci.c +++ b/hw/xfree86/os-support/bus/sparcPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c,v 1.14 2003/08/24 17:37:04 dawes Exp $ */ /* * Copyright (C) 2001-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index 69254ce8c..fdb88e832 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.39 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h index 21b05cba4..cff5e808a 100644 --- a/hw/xfree86/os-support/bus/xf86Sbus.h +++ b/hw/xfree86/os-support/bus/xf86Sbus.h @@ -20,7 +20,6 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c index b6a33d27c..d83bc9116 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.c +++ b/hw/xfree86/os-support/bus/zx1PCI.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.8 2004/01/16 15:39:38 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/zx1PCI.h b/hw/xfree86/os-support/bus/zx1PCI.h index 2795b4459..f2b279382 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.h +++ b/hw/xfree86/os-support/bus/zx1PCI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.h,v 1.1 2003/02/23 20:26:49 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c index f3d774521..3759920c2 100644 --- a/hw/xfree86/os-support/drm/xf86drm.c +++ b/hw/xfree86/os-support/drm/xf86drm.c @@ -31,7 +31,6 @@ * DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.36 2003/08/24 17:35:35 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/drm/xf86drmHash.c b/hw/xfree86/os-support/drm/xf86drmHash.c index ae967b22f..ba81a6e8e 100644 --- a/hw/xfree86/os-support/drm/xf86drmHash.c +++ b/hw/xfree86/os-support/drm/xf86drmHash.c @@ -25,7 +25,6 @@ * * Authors: Rickard E. (Rik) Faith * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.4 2001/03/21 18:08:54 dawes Exp $ * * DESCRIPTION * diff --git a/hw/xfree86/os-support/drm/xf86drmRandom.c b/hw/xfree86/os-support/drm/xf86drmRandom.c index e3e94a2af..cd63aea4e 100644 --- a/hw/xfree86/os-support/drm/xf86drmRandom.c +++ b/hw/xfree86/os-support/drm/xf86drmRandom.c @@ -25,7 +25,6 @@ * * Authors: Rickard E. (Rik) Faith * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.4 2000/06/17 00:03:34 martin Exp $ * * DESCRIPTION * diff --git a/hw/xfree86/os-support/drm/xf86drmSL.c b/hw/xfree86/os-support/drm/xf86drmSL.c index e94825009..36d8fd50e 100644 --- a/hw/xfree86/os-support/drm/xf86drmSL.c +++ b/hw/xfree86/os-support/drm/xf86drmSL.c @@ -25,7 +25,6 @@ * * Authors: Rickard E. (Rik) Faith * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.3 2000/06/17 00:03:34 martin Exp $ * * DESCRIPTION * diff --git a/hw/xfree86/os-support/int10Defines.h b/hw/xfree86/os-support/int10Defines.h index 56e10cf67..d942fbdad 100644 --- a/hw/xfree86/os-support/int10Defines.h +++ b/hw/xfree86/os-support/int10Defines.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10Defines.h,v 1.4 2003/08/24 17:37:03 dawes Exp $ */ /* * Copyright (c) 2000-2001 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index 9f6d07ee6..6c8b230e7 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.32 2004/02/05 18:24:59 eich Exp $ */ /* * linux specific part of the int10 module * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h index 68ad34011..5aca9e9b1 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -1,4 +1,3 @@ -/* $XFree86: Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index d01297901..6f89cdb07 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.18 2002/01/25 21:56:19 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 77773f7fb..ded9e0fae 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -7,7 +7,6 @@ * Copyright © 2001 The XFree86 Project, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index a0722edd7..16ac80db8 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index d2aa03587..0a7612965 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index 63077e907..78756a67c 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 9933c6f7b..85b6def56 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 1.5 2005/04/20 12:25:35 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.14 2001/10/31 22:50:30 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index eb8cd537e..836aaa15b 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.25 2003/08/19 17:32:34 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 36a81e490..6ed0e44c6 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -23,7 +23,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.8.2.1 1998/06/05 16:23:12 dawes Exp $ */ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp"; diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index 2912f1699..a4890d2df 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.4 2003/11/03 05:11:52 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/linux/lnx_kbd.h b/hw/xfree86/os-support/linux/lnx_kbd.h index ac783bfbc..b2ae179e1 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.h +++ b/hw/xfree86/os-support/linux/lnx_kbd.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.h,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index 5e91032d3..4e6f2d25d 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/linux/lnx_mouse.c b/hw/xfree86/os-support/linux/lnx_mouse.c index ae4bdddc0..150547ea4 100644 --- a/hw/xfree86/os-support/linux/lnx_mouse.c +++ b/hw/xfree86/os-support/linux/lnx_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_mouse.c,v 1.2 2003/10/08 14:58:30 dawes Exp $ */ /* * Copyright 1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 72939f489..a1dbc7604 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 29b7800f3..051970b23 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/linux/lnx_video.c,v 1.10 2005/09/19 18:38:26 alanc Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.67 2003/06/25 18:27:07 eich Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 84db50127..03f72ca19 100644 --- a/hw/xfree86/os-support/lynxos/lynx_init.c +++ b/hw/xfree86/os-support/lynxos/lynx_init.c @@ -22,7 +22,6 @@ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index 761fec0e0..818104634 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -21,7 +21,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index 75ed0731b..3364399aa 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -21,7 +21,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/lynxos/lynx_mouse.c b/hw/xfree86/os-support/lynxos/lynx_mouse.c index c04d0f71a..b48202977 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mouse.c +++ b/hw/xfree86/os-support/lynxos/lynx_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mouse.c,v 1.1 1999/05/22 08:40:14 dawes Exp $ */ /* * Copyright 1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 0e143256a..d4db82cca 100644 --- a/hw/xfree86/os-support/lynxos/lynx_noinline.c +++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.5 2000/07/31 23:25:18 tsi Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_ppc.c b/hw/xfree86/os-support/lynxos/lynx_ppc.c index e587b7ee0..6300f38c8 100644 --- a/hw/xfree86/os-support/lynxos/lynx_ppc.c +++ b/hw/xfree86/os-support/lynxos/lynx_ppc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.c,v 1.1 2002/12/14 04:41:14 dawes Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index 4e707a989..4602076c7 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -21,7 +21,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index 58864e5e0..b482b867a 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -12,7 +12,6 @@ Thanks to Linus Torvalds for contributing this code. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index 7c105a9e0..b56595377 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index 083cfed8a..54b7c1816 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -4,7 +4,6 @@ Stub for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index be870194a..1fda7fc10 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -4,7 +4,6 @@ for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6tsi Exp $ */ /* * Create a dependency that should be immune from the effect of register diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c index d8053f7d2..1ec0f569d 100644 --- a/hw/xfree86/os-support/misc/xf86_IlHack.c +++ b/hw/xfree86/os-support/misc/xf86_IlHack.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.4.4.1 1998/06/04 17:36:01 dawes Exp $ */ /* * This file is an incredible crock to get the normally-inline functions * built into the server so that things can be debugged properly. diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index afcdd5b69..77df1e248 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.7 1999/01/14 13:05:05 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index beb86ccad..ba2f7adee 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.2 1998/07/25 16:56:57 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * Copyright 1993 by David McCullough diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index bc1f3b56d..07f30f019 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.13 2002/06/03 21:22:10 dawes Exp $ */ /* * Copyright 2001-2005 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index 6067d51a5..eafc14cfb 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.9 2002/10/11 01:40:36 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index f9d068c24..29e1f6f3c 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.12 2001/06/30 22:41:49 tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index dd81786bb..807028f6a 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.8tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index ac8ae3b0a..fd05f399c 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.1.4.1 1998/06/05 16:23:20 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index b38470aea..0100ae928 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.1.4.1 1998/06/05 16:23:21 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index e85b1f8d4..0a7844894 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c,v 1.5 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2000-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/at_scancode.c b/hw/xfree86/os-support/shared/at_scancode.c index 8947254bc..10d3da2ba 100644 --- a/hw/xfree86/os-support/shared/at_scancode.c +++ b/hw/xfree86/os-support/shared/at_scancode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c,v 1.4 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index b63704cde..86d38292f 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index 5f300a967..40d37e0c3 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c index 1fe119dcd..708840c71 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.c +++ b/hw/xfree86/os-support/shared/ia64Pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ia64Pci.c,v 1.3 2003/02/23 20:26:49 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index 04e72fe1c..2427d1923 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.3 1998/07/25 16:57:00 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/kbd.c b/hw/xfree86/os-support/shared/kbd.c index b9aeafd7b..dd6d77d82 100644 --- a/hw/xfree86/os-support/shared/kbd.c +++ b/hw/xfree86/os-support/shared/kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/kbd.c,v 1.3 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2001-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/kmod_noop.c b/hw/xfree86/os-support/shared/kmod_noop.c index 935f44bbe..6525e8414 100644 --- a/hw/xfree86/os-support/shared/kmod_noop.c +++ b/hw/xfree86/os-support/shared/kmod_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c,v 1.2 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index fb1363ab2..4c4af4c24 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v 1.102 2003/11/19 03:52:58 dawes Exp $ */ /* * Copyright 1997-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index 6e24653ba..bfac4b1c8 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/pm_noop.c,v 1.2 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 3f9a82214..6e1b54331 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c,v 3.30 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright 1993-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index 8d47805fe..f6c15c28f 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c,v 1.16 2003/09/04 00:21:17 dawes Exp $ */ /* sigio.c -- Support for SIGIO handler installation and removal * Created: Thu Jun 3 15:39:18 1999 by faith@precisioninsight.com diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index db54e53d3..1a196cb30 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.4 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * @@ -25,7 +24,6 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/shared/sigiostubs.c,v 1.5 2005/07/03 07:01:35 daniels Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c index 491406f92..e55ac77be 100644 --- a/hw/xfree86/os-support/shared/stdPci.c +++ b/hw/xfree86/os-support/shared/stdPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdPci.c,v 3.4 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index 83ad0bb42..ad4685605 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c,v 1.22 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index c678162c2..f56a5fd05 100644 --- a/hw/xfree86/os-support/shared/std_kbdEv.c +++ b/hw/xfree86/os-support/shared/std_kbdEv.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 3a3544e8c..d7d75191e 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index c2618d075..4d775eb52 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c,v 1.17 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1993-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/xf86Axp.c b/hw/xfree86/os-support/shared/xf86Axp.c index b8953f119..e6511dd43 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.c +++ b/hw/xfree86/os-support/shared/xf86Axp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.c,v 1.3 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/solaris/agpgart.h b/hw/xfree86/os-support/solaris/agpgart.h index 09d63ec26..566de8046 100644 --- a/hw/xfree86/os-support/solaris/agpgart.h +++ b/hw/xfree86/os-support/solaris/agpgart.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/agpgart.h,v 1.1 2005/06/09 03:11:58 alanc Exp $ */ /* * AGPGART module version 0.99 * Copyright (C) 1999 Jeff Hartmann diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c index 9db2b86ba..e97ab9ef9 100644 --- a/hw/xfree86/os-support/solaris/sun_agp.c +++ b/hw/xfree86/os-support/solaris/sun_agp.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_agp.c,v 1.5 2005/08/24 22:37:15 alanc Exp $ */ /* * Abstraction of the AGP GART interface. * diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c index 18f6558f3..6a132f5a3 100644 --- a/hw/xfree86/os-support/solaris/sun_bios.c +++ b/hw/xfree86/os-support/solaris/sun_bios.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 40c264ce0..691cb3f9e 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.5 2001/11/25 13:51:24 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat @@ -22,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.3 2005/05/21 07:46:37 alanc Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c index 96344033f..3d8292e72 100644 --- a/hw/xfree86/os-support/solaris/sun_io.c +++ b/hw/xfree86/os-support/solaris/sun_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.2 2002/10/11 01:40:37 dawes Exp $ */ /* $XdotOrg: $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 55ab46722..2cb1d13a8 100644 --- a/hw/xfree86/os-support/solaris/sun_kbd.c +++ b/hw/xfree86/os-support/solaris/sun_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.1 2001/05/28 02:42:31 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes @@ -50,7 +49,6 @@ * or other dealings in this Software without prior written authorization * of the copyright holder. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.3 2004/06/13 04:50:21 alanc Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index 8eee962ef..df8b6fac5 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2003/08/26 19:00:36 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes @@ -23,7 +22,6 @@ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_kbdEv.c,v 1.10 2005/12/12 23:33:55 alanc Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c index c8efa8dbe..aa509d08b 100644 --- a/hw/xfree86/os-support/solaris/sun_mouse.c +++ b/hw/xfree86/os-support/solaris/sun_mouse.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_mouse.c,v 1.8 2005/07/28 02:38:23 alanc Exp $ */ /* * Copyright 1999-2001 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index f3409dcb2..4f2ab871f 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.2 2001/10/28 03:34:03 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 3edffd446..6d0045f9b 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.4.4.3 1998/07/18 17:53:57 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index d10c40fa4..d6c8ca037 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.10 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/sysv/sysv_mouse.c b/hw/xfree86/os-support/sysv/sysv_mouse.c index e3c084e14..581ed58e8 100644 --- a/hw/xfree86/os-support/sysv/sysv_mouse.c +++ b/hw/xfree86/os-support/sysv/sysv_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_mouse.c,v 1.3 1999/09/04 13:04:49 dawes Exp $ */ /* * Copyright 1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index 2b491be0e..fd6d61321 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.20tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index e9cab1588..f0032111f 100644 --- a/hw/xfree86/os-support/sysv/xqueue.c +++ b/hw/xfree86/os-support/sysv/xqueue.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.19 2000/02/10 22:33:45 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993-1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/usl/usl_io.c b/hw/xfree86/os-support/usl/usl_io.c index 45c511f42..4cb23d40e 100644 --- a/hw/xfree86/os-support/usl/usl_io.c +++ b/hw/xfree86/os-support/usl/usl_io.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_io.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2001-2005 by Kean Johnston * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany diff --git a/hw/xfree86/os-support/usl/usl_iop.c b/hw/xfree86/os-support/usl/usl_iop.c index ae30655f8..23c36fbf7 100644 --- a/hw/xfree86/os-support/usl/usl_iop.c +++ b/hw/xfree86/os-support/usl/usl_iop.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_iop.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2001,2005 by Kean Johnston * diff --git a/hw/xfree86/os-support/usl/usl_kbd.c b/hw/xfree86/os-support/usl/usl_kbd.c index 5f96fa676..d6e6af212 100644 --- a/hw/xfree86/os-support/usl/usl_kbd.c +++ b/hw/xfree86/os-support/usl/usl_kbd.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_kbd.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2005 by Kean Johnston * diff --git a/hw/xfree86/os-support/usl/usl_mouse.c b/hw/xfree86/os-support/usl/usl_mouse.c index f70a0b89e..15a0ac5ac 100644 --- a/hw/xfree86/os-support/usl/usl_mouse.c +++ b/hw/xfree86/os-support/usl/usl_mouse.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_mouse.c,v 1.3 2005/11/10 02:41:20 jkj Exp $ */ /* * Copyright 2005 Kean Johnston diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h index 344f7e901..4ab722ca3 100644 --- a/hw/xfree86/os-support/xf86OSKbd.h +++ b/hw/xfree86/os-support/xf86OSKbd.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5tsi Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86OSmouse.h b/hw/xfree86/os-support/xf86OSmouse.h index 9db1bac19..600683866 100644 --- a/hw/xfree86/os-support/xf86OSmouse.h +++ b/hw/xfree86/os-support/xf86OSmouse.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h,v 1.24 2003/11/03 05:11:51 tsi Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h index 449e8ddd0..754128de9 100644 --- a/hw/xfree86/os-support/xf86OSpriv.h +++ b/hw/xfree86/os-support/xf86OSpriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSpriv.h,v 1.6 2003/08/24 17:37:03 dawes Exp $ */ /* * Copyright (c) 1999-2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 8ff324e70..e04854729 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.94 2003/11/03 05:11:51 tsi Exp $ */ /* * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany * Copyright 1992 by David Dawes @@ -67,7 +66,6 @@ */ /* $XConsortium: xf86_OSlib.h /main/22 1996/10/27 11:06:31 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/xf86_OSlib.h,v 1.14 2005/12/29 08:42:49 airlied Exp $ */ /* * This is private, and should not be included by any drivers. Drivers diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 7922fde4e..89a33013f 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -64,7 +64,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.56 2003/08/24 17:37:03 dawes Exp $ */ #ifndef _XF86_OSPROC_H #define _XF86_OSPROC_H diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index 31c0cac99..c1d62ed9f 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v 3.53 2003/10/28 18:36:37 tsi Exp $ */ /* * Copyright 1997-2003 by The XFree86 Project, Inc * diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index 75b622529..df78d5351 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/xf86_libc.h,v 1.9 2005/08/24 11:18:31 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86drm.h b/hw/xfree86/os-support/xf86drm.h index 4be417a62..88f5e0ffc 100644 --- a/hw/xfree86/os-support/xf86drm.h +++ b/hw/xfree86/os-support/xf86drm.h @@ -31,7 +31,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.26 2003/08/16 19:26:37 dawes Exp $ */ #ifndef _XF86DRM_H_ #define _XF86DRM_H_ diff --git a/hw/xfree86/os-support/xf86drmCompat.h b/hw/xfree86/os-support/xf86drmCompat.h index bdca46626..8ac6ee429 100644 --- a/hw/xfree86/os-support/xf86drmCompat.h +++ b/hw/xfree86/os-support/xf86drmCompat.h @@ -32,7 +32,6 @@ * Backwards compatability modules broken out by: * Jens Owen * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmCompat.h,v 1.1 2002/10/30 12:52:23 alanh Exp $ * */ diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h index a51116b55..c20c1958c 100644 --- a/hw/xfree86/parser/Configint.h +++ b/hw/xfree86/parser/Configint.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Configint.h,v 1.21 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c index 93d0d4b52..dc75cd23f 100644 --- a/hw/xfree86/parser/DRI.c +++ b/hw/xfree86/parser/DRI.c @@ -24,7 +24,6 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.13 2003/01/01 19:22:20 paulo Exp $ * */ diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 6eb2857f0..6ad5601b5 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Device.c,v 1.27 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index cbbcc74c8..2688bb100 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Files.c,v 1.16 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index bda24df1b..7ab70d1a8 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Flags.c,v 1.23 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 9f9323f05..3e2186a9d 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Input.c,v 1.14 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Keyboard.c b/hw/xfree86/parser/Keyboard.c index 62031f629..9749a1a21 100644 --- a/hw/xfree86/parser/Keyboard.c +++ b/hw/xfree86/parser/Keyboard.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Keyboard.c,v 1.17 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 3f6c4fbde..b9f4e9e6a 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Layout.c,v 1.24 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c index 378d4acdc..f3ed9d19f 100644 --- a/hw/xfree86/parser/Module.c +++ b/hw/xfree86/parser/Module.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Module.c,v 1.12 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index f8e42d09b..4a8575049 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Monitor.c,v 1.28 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Pointer.c b/hw/xfree86/parser/Pointer.c index c17aa5846..eeb0834bf 100644 --- a/hw/xfree86/parser/Pointer.c +++ b/hw/xfree86/parser/Pointer.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Pointer.c,v 1.13 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index d572af56c..b7a64b035 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Screen.c,v 1.28 2003/11/07 23:41:41 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Vendor.c b/hw/xfree86/parser/Vendor.c index 9c6469bb8..3e9358b3b 100644 --- a/hw/xfree86/parser/Vendor.c +++ b/hw/xfree86/parser/Vendor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Vendor.c,v 1.17 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index 88788aea8..fa0ff7833 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Video.c,v 1.13 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h index bb5f4e9b2..832437cd2 100644 --- a/hw/xfree86/parser/configProcs.h +++ b/hw/xfree86/parser/configProcs.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/configProcs.h,v 1.17 2003/08/24 17:37:08 dawes Exp $ */ /* * Copyright (c) 1997-2001 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c index d16a242da..46a5a8b56 100644 --- a/hw/xfree86/parser/cpconfig.c +++ b/hw/xfree86/parser/cpconfig.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.6 2000/10/20 14:59:03 alanh Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index 59b0ea6fb..598a12666 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/read.c,v 1.24 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index ce3cda128..5b29ab855 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/scan.c,v 1.30 2003/11/03 05:11:52 tsi Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index de3bb8a49..1869f56a6 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/write.c,v 1.18 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h index c38f2c219..183b85720 100644 --- a/hw/xfree86/parser/xf86Optrec.h +++ b/hw/xfree86/parser/xf86Optrec.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Optrec.h,v 1.11 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index 75ee27337..a6829273c 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h,v 1.33 2003/10/08 14:58:30 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index 3c7e68ece..d5948dd5b 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86tokens.h,v 1.20 2003/08/24 17:37:09 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index 783d79b93..366c21485 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.2 1999/05/15 12:10:33 dawes Exp $ */ #ifndef __XF86RAC_H #define __XF86RAC_H 1 diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 5c3139d91..5aa27a1f8 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -23,7 +23,6 @@ * * BT RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index c52b5a745..b3426bada 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */ #include "xf86RamDac.h" diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index 17edaefdc..184b4811c 100644 --- a/hw/xfree86/ramdac/BTPriv.h +++ b/hw/xfree86/ramdac/BTPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 42bff44a9..2d9fe4d8f 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -23,7 +23,6 @@ * * IBM RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index eb211883c..fdb0f5ad1 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */ #include diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 994296517..a33da9106 100644 --- a/hw/xfree86/ramdac/IBMPriv.h +++ b/hw/xfree86/ramdac/IBMPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 390bc6b7b..f421fc39a 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -24,7 +24,6 @@ * Modified from IBM.c to support TI RAMDAC routines * by Jens Owen, . */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index f33247cfc..bc807f40c 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */ #include diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index d66149dcf..191c9b5ce 100644 --- a/hw/xfree86/ramdac/TIPriv.h +++ b/hw/xfree86/ramdac/TIPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 17a49669d..a903f7f02 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index ac88f4e5f..08cca6b96 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */ #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 9829f34e3..472e2b06b 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index aef1c8bb1..91caea047 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index e0314f6b7..1dd3daf1b 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -23,7 +23,6 @@ * * Generic RAMDAC access routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 319a7b577..1f03dfb99 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */ #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index 04f50f166..600fe3f07 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -23,7 +23,6 @@ * * Generic RAMDAC access to colormaps. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index ae5fc72c5..f68e588f5 100644 --- a/hw/xfree86/ramdac/xf86RamDacPriv.h +++ b/hw/xfree86/ramdac/xf86RamDacPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/scanpci/xf86PciData.h b/hw/xfree86/scanpci/xf86PciData.h index 7cc81b755..5f92a7d03 100644 --- a/hw/xfree86/scanpci/xf86PciData.h +++ b/hw/xfree86/scanpci/xf86PciData.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.h,v 1.3 2003/08/24 17:37:10 dawes Exp $ */ /* * Copyright (c) 2000-2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h index 178b9aaa0..7b0c3cbc6 100644 --- a/hw/xfree86/scanpci/xf86PciStdIds.h +++ b/hw/xfree86/scanpci/xf86PciStdIds.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.10 2006/01/27 12:27:34 alanh Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT diff --git a/hw/xfree86/scanpci/xf86PciStr.h b/hw/xfree86/scanpci/xf86PciStr.h index 307dfacdf..41b039c2c 100644 --- a/hw/xfree86/scanpci/xf86PciStr.h +++ b/hw/xfree86/scanpci/xf86PciStr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStr.h,v 1.2 2003/08/24 17:37:10 dawes Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/scanpci/xf86ScanPci.h b/hw/xfree86/scanpci/xf86ScanPci.h index 9107b9e32..93ecee8dc 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.h +++ b/hw/xfree86/scanpci/xf86ScanPci.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.h,v 1.3 2003/08/24 17:37:10 dawes Exp $ */ /* * Copyright (c) 2000-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index cea2571b3..2fc02a7b8 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -6,7 +6,6 @@ Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index e42822600..6c9635879 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.3 2002/10/16 22:12:54 alanh Exp $ */ #ifndef _SHADOWFB_H #define _SHADOWFB_H diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c index 109e2bbb3..fd4a4f23c 100644 --- a/hw/xfree86/utils/gtf/gtf.c +++ b/hw/xfree86/utils/gtf/gtf.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2004/04/23 19:53:57 eich Exp $ */ /* gtf.c Generate mode timings using the GTF Timing Standard * * gcc gtf.c -o gtf -lm -Wall @@ -103,7 +102,6 @@ * o Error checking. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H # include diff --git a/hw/xfree86/utils/ioport/ioport.c b/hw/xfree86/utils/ioport/ioport.c index bd42f637f..32213642e 100644 --- a/hw/xfree86/utils/ioport/ioport.c +++ b/hw/xfree86/utils/ioport/ioport.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.4 2003/01/01 19:16:41 tsi Exp $ */ /* * Copyright 2002 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c index 865a59113..afa8510b0 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.5 1996/12/23 06:47:13 dawes Exp $ */ /* Keyboard mode control program for 386BSD */ diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c index c96839c0a..96a4644a0 100644 --- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c @@ -1,4 +1,3 @@ -/* $Xorg: kbd_mode.c,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ */ /* $XdotOrg: $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -28,7 +27,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: kbd_mode.c,v 3.11 2002/10/23 16:23:36 tsi Exp $ */ /* static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13"; diff --git a/hw/xfree86/utils/pcitweak/pcitweak.c b/hw/xfree86/utils/pcitweak/pcitweak.c index a7c6a3263..5648e796d 100644 --- a/hw/xfree86/utils/pcitweak/pcitweak.c +++ b/hw/xfree86/utils/pcitweak/pcitweak.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.c,v 1.17 2003/08/24 17:37:01 dawes Exp $ */ /* * Copyright (c) 1999-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c index dac7d45af..609f1faaf 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -23,7 +23,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ #include #include "os.h" diff --git a/hw/xfree86/utils/xorgcfg/accessx.c b/hw/xfree86/utils/xorgcfg/accessx.c index cb8929b81..38bda383a 100644 --- a/hw/xfree86/utils/xorgcfg/accessx.c +++ b/hw/xfree86/utils/xorgcfg/accessx.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.8 2001/01/26 21:17:40 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c index 3970f02c8..1f3b7555e 100644 --- a/hw/xfree86/utils/xorgcfg/card-cfg.c +++ b/hw/xfree86/utils/xorgcfg/card-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/cards.c b/hw/xfree86/utils/xorgcfg/cards.c index 62bcfbbda..dcd5828cb 100644 --- a/hw/xfree86/utils/xorgcfg/cards.c +++ b/hw/xfree86/utils/xorgcfg/cards.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.14 2002/09/12 15:19:07 tsi Exp $ */ #define CARDS_PRIVATE diff --git a/hw/xfree86/utils/xorgcfg/cards.h b/hw/xfree86/utils/xorgcfg/cards.h index 913d9c8b8..8557e96df 100644 --- a/hw/xfree86/utils/xorgcfg/cards.h +++ b/hw/xfree86/utils/xorgcfg/cards.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.2 2001/07/06 02:04:10 paulo Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/config.c b/hw/xfree86/utils/xorgcfg/config.c index 4d656a53d..8c985bf34 100644 --- a/hw/xfree86/utils/xorgcfg/config.c +++ b/hw/xfree86/utils/xorgcfg/config.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.8tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h index 6cbdc5e30..62187b0d4 100644 --- a/hw/xfree86/utils/xorgcfg/config.h +++ b/hw/xfree86/utils/xorgcfg/config.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c index 06bffb79a..5c22a6e70 100644 --- a/hw/xfree86/utils/xorgcfg/expert.c +++ b/hw/xfree86/utils/xorgcfg/expert.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.14tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c index c6bfcbad2..cd5c2c2f4 100644 --- a/hw/xfree86/utils/xorgcfg/help.c +++ b/hw/xfree86/utils/xorgcfg/help.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.7tsi Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index b6ac82a06..b98d6ce73 100644 --- a/hw/xfree86/utils/xorgcfg/interface.c +++ b/hw/xfree86/utils/xorgcfg/interface.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v 1.8 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) * @@ -27,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.36 2002/10/19 20:04:21 herrb Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c index 2e82323be..4856c5247 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.21 2002/12/05 20:24:21 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h index 64438bd71..512a19d7a 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.2 2000/06/13 23:15:51 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c index 37378701e..8a9ad1aef 100644 --- a/hw/xfree86/utils/xorgcfg/loader.c +++ b/hw/xfree86/utils/xorgcfg/loader.c @@ -26,8 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v 1.5 2005/12/08 17:54:40 kem Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index 847dbae70..16c527327 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.6 2001/07/07 01:43:58 paulo Exp $ */ #ifdef USE_MODULES diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c index 8f970cb72..598d0c06a 100644 --- a/hw/xfree86/utils/xorgcfg/loadmod.c +++ b/hw/xfree86/utils/xorgcfg/loadmod.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.16 2003/03/12 16:40:28 tsi Exp $ */ #ifdef USE_MODULES diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c index abe3cbf28..a443c54c2 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.c +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.6 2001/02/21 23:37:03 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.h b/hw/xfree86/utils/xorgcfg/monitor-cfg.h index b480358f7..48fc804bf 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.h +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c index 49bfc61a2..6c29c1f07 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/options.c b/hw/xfree86/utils/xorgcfg/options.c index 4187c1c3d..d229bb17f 100644 --- a/hw/xfree86/utils/xorgcfg/options.c +++ b/hw/xfree86/utils/xorgcfg/options.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.11 2001/10/28 03:34:08 tsi Exp $ */ #include "options.h" diff --git a/hw/xfree86/utils/xorgcfg/options.h b/hw/xfree86/utils/xorgcfg/options.h index 066de7d3a..2d08ca448 100644 --- a/hw/xfree86/utils/xorgcfg/options.h +++ b/hw/xfree86/utils/xorgcfg/options.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.6 2001/06/01 18:43:50 tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c index c20c84cba..4c67d725a 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.c +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.13tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.h b/hw/xfree86/utils/xorgcfg/screen-cfg.h index 6098c71fe..07e9bc3ee 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.h +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen.c b/hw/xfree86/utils/xorgcfg/screen.c index 6ee6f0241..6b411de15 100644 --- a/hw/xfree86/utils/xorgcfg/screen.c +++ b/hw/xfree86/utils/xorgcfg/screen.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.8 2001/10/28 03:34:08 tsi Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/screen.h b/hw/xfree86/utils/xorgcfg/screen.h index 135eeb51a..293820db4 100644 --- a/hw/xfree86/utils/xorgcfg/screen.h +++ b/hw/xfree86/utils/xorgcfg/screen.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c index 8d12ff802..7b730c9aa 100644 --- a/hw/xfree86/utils/xorgcfg/startx.c +++ b/hw/xfree86/utils/xorgcfg/startx.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.7 2002/01/07 20:38:29 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c index a8b0566de..47b2c2d5a 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.c +++ b/hw/xfree86/utils/xorgcfg/stubs.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.3 2002/11/09 11:12:53 herrb Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/stubs.h b/hw/xfree86/utils/xorgcfg/stubs.h index 9b661f3d8..c2f9f76b0 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.h +++ b/hw/xfree86/utils/xorgcfg/stubs.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.2 2000/10/23 21:16:52 tsi Exp $ */ #ifndef _xf86cfg_stubs_h diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 8537252e6..10f4b698f 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v 1.8 2006/05/03 17:50:10 ajax Exp $ */ /* * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) * @@ -27,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.25 2003/11/12 00:10:30 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c index 5226a5fc4..2d613b6df 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.c +++ b/hw/xfree86/utils/xorgcfg/vidmode.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.7tsi Exp $ */ /* diff --git a/hw/xfree86/utils/xorgcfg/vidmode.h b/hw/xfree86/utils/xorgcfg/vidmode.h index 4f2058cea..d0c71d5c6 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.h +++ b/hw/xfree86/utils/xorgcfg/vidmode.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.1 2000/05/18 16:30:00 dawes Exp $ */ #ifndef _xf86cfg_vidmode_h diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c index 6d93afe34..2c667dcde 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.c +++ b/hw/xfree86/utils/xorgcfg/xf86config.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/xf86config.h b/hw/xfree86/utils/xorgcfg/xf86config.h index 6c198cde0..9387d782f 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.h +++ b/hw/xfree86/utils/xorgcfg/xf86config.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.2 2000/05/18 16:30:01 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index b5f23a00f..f903d7f9c 100644 --- a/hw/xfree86/utils/xorgconfig/cards.c +++ b/hw/xfree86/utils/xorgconfig/cards.c @@ -1,11 +1,9 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v 1.4 2005/07/01 22:43:35 daniels Exp $ */ /* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.16 2001/07/25 15:05:09 dawes Exp $ */ /* * Functions to manipulate card database. diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h index 1d9892491..b667ec685 100644 --- a/hw/xfree86/utils/xorgconfig/cards.h +++ b/hw/xfree86/utils/xorgconfig/cards.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.4 1999/03/28 15:33:07 dawes Exp $ */ diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index ab3c1d03c..f00eea038 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.69 2003/02/20 04:05:15 dawes Exp $ */ /* * This is a configuration program that will create a base XF86Config @@ -93,7 +92,6 @@ * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) */ /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.20 2006/04/18 17:28:44 spyderous Exp $ */ #ifdef HAVE_CONFIG_H # include "xorg-server.h" diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 7528ad164..c0e983391 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.2tsi Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index c7970abd0..83b5a99b1 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.4 2004/01/07 04:28:06 dawes Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index 436a8a8dd..ef2c728f4 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -27,7 +27,6 @@ * * Authors: David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index 2a8d1b33a..c28cdaa37 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -26,7 +26,6 @@ * * Authors: David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $ */ #ifndef _VBE_MODES_H diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index d3f6d427d..c7c58d582 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.5 1998/11/22 10:37:38 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 6df7dee18..36fd0099d 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.59 2004/02/11 22:06:22 tsi Exp $ */ /* * diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index c200aee9a..0879f9641 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h,v 1.31 2002/04/04 14:05:56 eich Exp $ */ /* diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index d4ff7bbd8..c8d0467e9 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */ #ifndef _XAA_H #define _XAA_H diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 3639ec787..6c81f6413 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.3tsi Exp $ */ /* This is a lighter version of cfbBitBlt. We calculate the boxes diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index eda0b02ca..9dbd00f3c 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index 940525927..f7ae78d3f 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 2fe3ab1c3..89b4441ab 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index 95a22adf5..cd9e9d47f 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.13tsi Exp $ */ /* A CopyPlane function that handles bitmap->screen copies and diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index 198f8e95c..1ff955c6c 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index 22645ea1b..2a94a9e6c 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index 111bd45e3..7ab4031f8 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index d8e2739c6..d3ebc22fc 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -21,7 +21,6 @@ * * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.3 1998/10/25 07:12:12 dawes Exp $ */ /* * Filled solid arcs, based on cfbfillarc.c. diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 26a2646e7..23c27818e 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ /* * Copyright 1996 The XFree86 Project diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index 1bd7bd14d..55a30bbd6 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index ab46e9b4b..e22081103 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 5a6a0abce..f7bd576f1 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index a0d7bfb7a..910c7e1e2 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index f29a2eb3a..1542fc26e 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index c6b78307a..7469de179 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 7bb312971..d786737af 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 881707396..556650fb0 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 8c62af477..a5608c922 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.12 2000/04/07 19:11:10 mvojkovi Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index d1c737c06..7c9d53270 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.5 1999/07/04 06:39:17 dawes Exp $ */ /* Copyright (c) 1999 - The XFree86 Project Inc. diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 53a0827e2..016459091 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaOverlay.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index 883e94e6e..cfdac380e 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -3,7 +3,6 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index b8dd77465..441788cd8 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 4a82b49c5..af5680c67 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaPaintWin.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index a7acf450a..55f0f6e99 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.18 2003/04/23 18:35:34 eich Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 1c56d80dc..0a7e174b7 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 150991d7b..7d0943d72 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index 86c12cc7e..a614fe28c 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 7ea9a2dc2..0dd8e9fcf 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index f755ed9a9..c8d65968b 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 72e1858f6..fc445726f 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.6 1998/12/20 11:57:52 dawes Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c index 6c16f11d3..829527dd6 100644 --- a/hw/xfree86/xaa/xaaTables.c +++ b/hw/xfree86/xaa/xaaTables.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.1.2.1 1998/07/12 09:43:04 dawes Exp $ */ /* * This is a table of 24-bit values, indexed with an 8-bit byte value, then diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index 369088e32..9479b0d7a 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaWideLine.c,v 1.7 2005/07/03 08:53:49 daniels Exp $ */ /* XAAPolylinesWideSolid does not maintain a span list and subsequently does diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 9decdc594..56bcda69a 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 883e64d5b..7210d8492 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */ #ifndef _XAALOCAL_H #define _XAALOCAL_H diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index 3ba0c1699..32c17a60c 100644 --- a/hw/xfree86/xaa/xaawrap.h +++ b/hw/xfree86/xaa/xaawrap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.3 1998/10/25 07:12:14 dawes Exp $ */ #define XAA_SCREEN_PROLOGUE(pScreen, field)\ ((pScreen)->field = \ diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index 12695003c..5825c1cf4 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 454091538..16237a163 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/xf1bpp.h b/hw/xfree86/xf1bpp/xf1bpp.h index 18104a77e..33e5818c3 100644 --- a/hw/xfree86/xf1bpp/xf1bpp.h +++ b/hw/xfree86/xf1bpp/xf1bpp.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/xf1bpp.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */ /* * Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index cc4266c3a..65f002000 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.3 1999/01/31 12:22:15 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index 2f63b1435..22ba90c2b 100644 --- a/hw/xfree86/xf4bpp/emulOpStip.c +++ b/hw/xfree86/xf4bpp/emulOpStip.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index 9ae62149f..235bf9bd0 100644 --- a/hw/xfree86/xf4bpp/emulRepAre.c +++ b/hw/xfree86/xf4bpp/emulRepAre.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index c4f15cad6..ddce1dab0 100644 --- a/hw/xfree86/xf4bpp/emulTile.c +++ b/hw/xfree86/xf4bpp/emulTile.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h index 15231a653..1bed6759f 100644 --- a/hw/xfree86/xf4bpp/ibmTrace.h +++ b/hw/xfree86/xf4bpp/ibmTrace.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.1.2.1 1998/06/27 14:48:30 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index b54e23965..f0c3f7e7b 100644 --- a/hw/xfree86/xf4bpp/mfbbres.c +++ b/hw/xfree86/xf4bpp/mfbbres.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c index d28a6c2a3..ef800871e 100644 --- a/hw/xfree86/xf4bpp/mfbbresd.c +++ b/hw/xfree86/xf4bpp/mfbbresd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index e2cab12f5..88d4f72d9 100644 --- a/hw/xfree86/xf4bpp/mfbfillarc.c +++ b/hw/xfree86/xf4bpp/mfbfillarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.5tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index eb510c0fb..82a205e1b 100644 --- a/hw/xfree86/xf4bpp/mfbhrzvert.c +++ b/hw/xfree86/xf4bpp/mfbhrzvert.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.2 1998/07/25 16:59:29 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c index 03107bbf3..b1f0b9f72 100644 --- a/hw/xfree86/xf4bpp/mfbimggblt.c +++ b/hw/xfree86/xf4bpp/mfbimggblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.8 2003/11/03 05:11:56 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index 5df58a7e4..82d8bd1c5 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.5 2003/11/03 05:11:56 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 54aa3b0c9..921993196 100644 --- a/hw/xfree86/xf4bpp/mfbzerarc.c +++ b/hw/xfree86/xf4bpp/mfbzerarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.4tsi Exp $ */ /************************************************************ diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index 1bf634c80..f35bde7dd 100644 --- a/hw/xfree86/xf4bpp/offscreen.c +++ b/hw/xfree86/xf4bpp/offscreen.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.4 1999/10/13 20:04:26 alanh Exp $ */ /* * Copyright 1993 Gerrit Jan Akkerman * diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 56cab0d64..9c693e836 100644 --- a/hw/xfree86/xf4bpp/ppcArea.c +++ b/hw/xfree86/xf4bpp/ppcArea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index 7686b6f9b..947602ef3 100644 --- a/hw/xfree86/xf4bpp/ppcBStore.c +++ b/hw/xfree86/xf4bpp/ppcBStore.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index f937aac34..ab46f85ab 100644 --- a/hw/xfree86/xf4bpp/ppcCReduce.c +++ b/hw/xfree86/xf4bpp/ppcCReduce.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index 9166bf256..acfd5bd00 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.4 1999/06/06 08:48:58 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index e33795c77..cac588d42 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.6tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 8a67cdd30..26a53de86 100644 --- a/hw/xfree86/xf4bpp/ppcDepth.c +++ b/hw/xfree86/xf4bpp/ppcDepth.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.2 1998/07/25 16:59:33 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index 28c7acb6c..e501f65fb 100644 --- a/hw/xfree86/xf4bpp/ppcFillRct.c +++ b/hw/xfree86/xf4bpp/ppcFillRct.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 4aafb706b..8153051f0 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.7tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index 12a573c9d..fd064d1c1 100644 --- a/hw/xfree86/xf4bpp/ppcGCstr.h +++ b/hw/xfree86/xf4bpp/ppcGCstr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.3 2003/02/18 21:29:59 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index 0c48de4c8..dc31741f3 100644 --- a/hw/xfree86/xf4bpp/ppcGetSp.c +++ b/hw/xfree86/xf4bpp/ppcGetSp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.2 1998/07/25 16:59:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index 20b08ce9a..0d5afafa5 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.5tsi Exp $ */ /* Copyright (c) 1990 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index ab8774216..6ff7e8fef 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index c8801fd32..08b09e9c7 100644 --- a/hw/xfree86/xf4bpp/ppcPixFS.c +++ b/hw/xfree86/xf4bpp/ppcPixFS.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index 0ccefcbd6..9f4cdc99a 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.3 1999/01/14 13:05:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index 11195e033..85ac22e6c 100644 --- a/hw/xfree86/xf4bpp/ppcPntWin.c +++ b/hw/xfree86/xf4bpp/ppcPntWin.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index c78622482..399ba3bda 100644 --- a/hw/xfree86/xf4bpp/ppcPolyPnt.c +++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c index 085cb4b25..d7f866232 100644 --- a/hw/xfree86/xf4bpp/ppcPolyRec.c +++ b/hw/xfree86/xf4bpp/ppcPolyRec.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.2 1998/07/25 16:59:36 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 95914846d..810b81f24 100644 --- a/hw/xfree86/xf4bpp/ppcQuery.c +++ b/hw/xfree86/xf4bpp/ppcQuery.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.2 1998/07/25 16:59:37 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index ce00a8799..e4601e2af 100644 --- a/hw/xfree86/xf4bpp/ppcRslvC.c +++ b/hw/xfree86/xf4bpp/ppcRslvC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.4 1999/06/06 08:49:01 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index ffdc5d970..350cb9b14 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.2 1998/07/25 16:59:41 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h index bc56ca1fc..41245ceb3 100644 --- a/hw/xfree86/xf4bpp/ppcSpMcro.h +++ b/hw/xfree86/xf4bpp/ppcSpMcro.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.1.2.1 1998/06/27 14:48:49 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index 820b80e53..bd9b1289f 100644 --- a/hw/xfree86/xf4bpp/ppcWinFS.c +++ b/hw/xfree86/xf4bpp/ppcWinFS.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index a2e910b1c..11c5e343e 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.3 1999/06/06 08:49:06 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index e13312233..e51e0dc1a 100644 --- a/hw/xfree86/xf4bpp/vgaBitBlt.c +++ b/hw/xfree86/xf4bpp/vgaBitBlt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ /* GJA -- span move routines */ diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index 64b4dae48..fd33727b9 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.3tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index 4806b9461..22f8d8f8e 100644 --- a/hw/xfree86/xf4bpp/vgaImages.c +++ b/hw/xfree86/xf4bpp/vgaImages.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index 552f07140..c5165256c 100644 --- a/hw/xfree86/xf4bpp/vgaReg.h +++ b/hw/xfree86/xf4bpp/vgaReg.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.3 1999/06/06 08:49:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index 5cb47173c..562b1ebc4 100644 --- a/hw/xfree86/xf4bpp/vgaSolid.c +++ b/hw/xfree86/xf4bpp/vgaSolid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index a7bfa13d2..b81305bd4 100644 --- a/hw/xfree86/xf4bpp/vgaStipple.c +++ b/hw/xfree86/xf4bpp/vgaStipple.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index ba0aae662..14e85ef79 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.1.2.1 1998/06/27 14:48:54 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index 6b501b570..24ecf3dd2 100644 --- a/hw/xfree86/xf4bpp/wm3.c +++ b/hw/xfree86/xf4bpp/wm3.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.3 1999/06/06 08:49:08 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 1def6f607..2d66557fc 100644 --- a/hw/xfree86/xf4bpp/wm3.h +++ b/hw/xfree86/xf4bpp/wm3.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.2 1998/07/25 16:59:46 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 1f465374e..8d2da35a5 100644 --- a/hw/xfree86/xf4bpp/xf4bpp.h +++ b/hw/xfree86/xf4bpp/xf4bpp.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */ #ifndef __XF4BPP_H__ #define __XF4BPP_H__ diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h index 2785fa252..969fa290f 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32.h +++ b/hw/xfree86/xf8_32bpp/cfb8_32.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 842b872d7..f4d570f8b 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */ #define PSZ 8 #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 6958861ec..c2eb1a04e 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index 0ffafd048..a7787caa9 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.3 2000/02/11 06:33:46 mvojkovi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index 3f45a85d1..d90321355 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.5 2001/12/14 19:59:52 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 629d6bf6a..01a5a5eb6 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 30ddb0c4b..a1b988716 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.3 2005/04/20 12:25:40 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 2e4dd7296..7cbdb5a66 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index d2d4cfb6b..ce741cb55 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 2316db05f..c5585ca6d 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.8 2000/03/25 20:14:43 mvojkovi Exp $ */ /* Copyright (C) 1998. The XFree86 Project Inc. diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index a36677491..0aa0ca478 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -1,4 +1,3 @@ -/* $Xorg: Args.c,v 1.3 2000/08/17 19:53:26 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h index a0c586bcb..38090fd0e 100644 --- a/hw/xnest/Args.h +++ b/hw/xnest/Args.h @@ -1,4 +1,3 @@ -/* $Xorg: Args.h,v 1.3 2000/08/17 19:53:27 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index 779633a96..2dd60971f 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -1,4 +1,3 @@ -/* $Xorg: Color.c,v 1.3 2000/08/17 19:53:27 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h index 9ce72a946..aec0a248c 100644 --- a/hw/xnest/Color.h +++ b/hw/xnest/Color.h @@ -1,4 +1,3 @@ -/* $Xorg: Color.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index f95860022..134276e7b 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -1,4 +1,3 @@ -/* $Xorg: Cursor.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index fa8457651..57f3a688f 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -1,4 +1,3 @@ -/* $Xorg: Display.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h index 85aedc583..d0eefd57c 100644 --- a/hw/xnest/Display.h +++ b/hw/xnest/Display.h @@ -1,4 +1,3 @@ -/* $Xorg: Display.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.6 2001/01/17 22:36:55 dawes Exp $ */ #ifndef XNESTCOMMON_H #define XNESTCOMMON_H diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h index 7b96bdfee..61159c9ba 100644 --- a/hw/xnest/Drawable.h +++ b/hw/xnest/Drawable.h @@ -1,4 +1,3 @@ -/* $Xorg: Drawable.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 3d520279c..e5cf99e2c 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -1,4 +1,3 @@ -/* $Xorg: Events.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h index c61b26c0d..cdad9f398 100644 --- a/hw/xnest/Events.h +++ b/hw/xnest/Events.h @@ -1,4 +1,3 @@ -/* $Xorg: Events.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index d86816e8f..72edcee9a 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -1,4 +1,3 @@ -/* $Xorg: Font.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index e46b48f11..a52ce1f35 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -1,4 +1,3 @@ -/* $Xorg: GC.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index 233424823..ad9668ec1 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -1,4 +1,3 @@ -/* $Xorg: GCOps.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h index ccdc40ebe..fce9d6cb3 100644 --- a/hw/xnest/GCOps.h +++ b/hw/xnest/GCOps.h @@ -1,4 +1,3 @@ -/* $Xorg: GCOps.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index 9915502c4..a113f488a 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -1,4 +1,3 @@ -/* $Xorg: Handlers.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h index 9a1e809cc..fe064213e 100644 --- a/hw/xnest/Handlers.h +++ b/hw/xnest/Handlers.h @@ -1,4 +1,3 @@ -/* $Xorg: Handlers.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index dcbd724fd..8c397a7bb 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -1,4 +1,3 @@ -/* $Xorg: Init.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/Init.h b/hw/xnest/Init.h index 8fb9956eb..4bed0ee67 100644 --- a/hw/xnest/Init.h +++ b/hw/xnest/Init.h @@ -1,4 +1,3 @@ -/* $Xorg: Init.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index a6fabf5a5..f18cc9760 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -1,5 +1,3 @@ -/* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.9 2006/03/27 22:25:56 daniels Exp $ */ /* Copyright 1993 by Davor Matic @@ -13,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */ #define NEED_EVENTS #ifdef HAVE_XNEST_CONFIG_H diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h index 8237dac14..d87866c73 100644 --- a/hw/xnest/Keyboard.h +++ b/hw/xnest/Keyboard.h @@ -1,4 +1,3 @@ -/* $Xorg: Keyboard.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 046b73976..aa8bed933 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: Pixmap.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 1533a06d8..454449732 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -1,4 +1,3 @@ -/* $Xorg: Pointer.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h index 872dfb8ee..2012db4c3 100644 --- a/hw/xnest/Pointer.h +++ b/hw/xnest/Pointer.h @@ -1,4 +1,3 @@ -/* $Xorg: Pointer.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 660e54fe7..8e86efbdb 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -1,4 +1,3 @@ -/* $Xorg: Screen.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h index f35a2872d..db298e300 100644 --- a/hw/xnest/Screen.h +++ b/hw/xnest/Screen.h @@ -1,4 +1,3 @@ -/* $Xorg: Screen.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index bbdb71ec6..628e22a7d 100644 --- a/hw/xnest/Visual.c +++ b/hw/xnest/Visual.c @@ -1,4 +1,3 @@ -/* $Xorg: Visual.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h index dfa74dbdc..c2d715a65 100644 --- a/hw/xnest/Visual.h +++ b/hw/xnest/Visual.h @@ -1,4 +1,3 @@ -/* $Xorg: Visual.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index f652c342a..f87a1baa7 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -1,4 +1,3 @@ -/* $Xorg: Window.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h index 6cbccfdec..ffec9eb0a 100644 --- a/hw/xnest/XNCursor.h +++ b/hw/xnest/XNCursor.h @@ -1,4 +1,3 @@ -/* $Xorg: Cursor.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.2 2002/11/23 19:27:50 tsi Exp $ */ #ifndef XNESTCURSOR_H #define XNESTCURSOR_H diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index 7fb4017bd..f7b9e38c0 100644 --- a/hw/xnest/XNFont.h +++ b/hw/xnest/XNFont.h @@ -1,4 +1,3 @@ -/* $Xorg: XNFont.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h index 56939cceb..a59508739 100644 --- a/hw/xnest/XNGC.h +++ b/hw/xnest/XNGC.h @@ -1,4 +1,3 @@ -/* $Xorg: XNGC.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index fab1843d1..77cba24af 100644 --- a/hw/xnest/XNPixmap.h +++ b/hw/xnest/XNPixmap.h @@ -1,4 +1,3 @@ -/* $Xorg: Pixmap.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.3 2003/01/10 13:29:40 eich Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h index 3a57646a7..21be5f5e3 100644 --- a/hw/xnest/XNWindow.h +++ b/hw/xnest/XNWindow.h @@ -1,4 +1,3 @@ -/* $Xorg: XNWindow.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.3 2003/11/03 05:36:34 tsi Exp $ */ #ifndef XNESTWINDOW_H #define XNESTWINDOW_H diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index ade73833f..8ed3f8902 100644 --- a/hw/xnest/Xnest.h +++ b/hw/xnest/Xnest.h @@ -1,4 +1,3 @@ -/* $Xorg: Xnest.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright (c) 1995 X Consortium diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c index 0868b4480..33675ec75 100644 --- a/hw/xnest/os2Stub.c +++ b/hw/xnest/os2Stub.c @@ -26,7 +26,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.1 2002/05/31 18:46:04 dawes Exp $ */ /* This below implements select() for calls in xnest. It has been */ /* somewhat optimized for improved performance, but assumes a few */ diff --git a/hw/xprint/AttrValid.c b/hw/xprint/AttrValid.c index cf9476003..f8c292faa 100644 --- a/hw/xprint/AttrValid.c +++ b/hw/xprint/AttrValid.c @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.c,v 1.4 2001/03/14 18:43:17 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/AttrValid.h b/hw/xprint/AttrValid.h index fab3a7f5e..7bb7ce1c8 100644 --- a/hw/xprint/AttrValid.h +++ b/hw/xprint/AttrValid.h @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.h,v 1.4 2001/03/14 18:43:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/DiPrint.h b/hw/xprint/DiPrint.h index 6801ce046..22cbf0d43 100644 --- a/hw/xprint/DiPrint.h +++ b/hw/xprint/DiPrint.h @@ -1,4 +1,3 @@ -/* $Xorg: DiPrint.h,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Init.c b/hw/xprint/Init.c index 0f1be6791..69100d390 100644 --- a/hw/xprint/Init.c +++ b/hw/xprint/Init.c @@ -1,4 +1,3 @@ -/* $Xorg: Init.c,v 1.5 2001/03/07 17:31:33 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Oid.c b/hw/xprint/Oid.c index e4dadd519..a2af00108 100644 --- a/hw/xprint/Oid.c +++ b/hw/xprint/Oid.c @@ -1,4 +1,3 @@ -/* $Xorg: Oid.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Oid.h b/hw/xprint/Oid.h index fc9f12a5b..79e85ec64 100644 --- a/hw/xprint/Oid.h +++ b/hw/xprint/Oid.h @@ -1,4 +1,3 @@ -/* $Xorg: Oid.h,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/OidDefs.h b/hw/xprint/OidDefs.h index 55b6568f0..a3b37eaaf 100644 --- a/hw/xprint/OidDefs.h +++ b/hw/xprint/OidDefs.h @@ -1,4 +1,3 @@ -/* $Xorg: OidDefs.h,v 1.4 2001/03/14 18:45:13 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/OidStrs.h b/hw/xprint/OidStrs.h index 1792a6e16..5ed2089e0 100644 --- a/hw/xprint/OidStrs.h +++ b/hw/xprint/OidStrs.h @@ -1,4 +1,3 @@ -/* $Xorg: OidStrs.h,v 1.4 2001/03/14 18:45:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Util.c b/hw/xprint/Util.c index 12a2562a4..eb7f839c9 100644 --- a/hw/xprint/Util.c +++ b/hw/xprint/Util.c @@ -1,4 +1,3 @@ -/* $Xorg: Util.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.12 2001/08/01 00:44:45 tsi Exp $ */ /* To get the tempnam() prototype in */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/ValTree.c b/hw/xprint/ValTree.c index 6fa631617..60e340dc1 100644 --- a/hw/xprint/ValTree.c +++ b/hw/xprint/ValTree.c @@ -1,4 +1,3 @@ -/* $Xorg: ValTree.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c index 8e4c811cb..a24c1076b 100644 --- a/hw/xprint/attributes.c +++ b/hw/xprint/attributes.c @@ -1,4 +1,3 @@ -/* $Xorg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/attributes.h b/hw/xprint/attributes.h index 40df4fd0b..26864a2f0 100644 --- a/hw/xprint/attributes.h +++ b/hw/xprint/attributes.h @@ -1,4 +1,3 @@ -/* $Xorg: attributes.h,v 1.4 2001/03/14 18:42:44 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c index e182ea116..6cd3cfd3c 100644 --- a/hw/xprint/ddxInit.c +++ b/hw/xprint/ddxInit.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxInit.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/mediaSizes.c b/hw/xprint/mediaSizes.c index 7f582199d..7acc70679 100644 --- a/hw/xprint/mediaSizes.c +++ b/hw/xprint/mediaSizes.c @@ -1,4 +1,3 @@ -/* $Xorg: mediaSizes.c,v 1.4 2001/03/14 18:44:37 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/pcl/Makefile.am.inc b/hw/xprint/pcl/Makefile.am.inc index 38a784e13..c3af606ee 100644 --- a/hw/xprint/pcl/Makefile.am.inc +++ b/hw/xprint/pcl/Makefile.am.inc @@ -1,7 +1,6 @@ INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER) +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ $(PCL_DRIVER) libpcl_la_SOURCES = \ $(srcdir)/../pcl/PclArc.c \ diff --git a/hw/xprint/pcl/Pcl.h b/hw/xprint/pcl/Pcl.h index bb1f52b2c..217e30438 100644 --- a/hw/xprint/pcl/Pcl.h +++ b/hw/xprint/pcl/Pcl.h @@ -1,4 +1,3 @@ -/* $Xorg: Pcl.h,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclArc.c b/hw/xprint/pcl/PclArc.c index d675e1699..0d8289e33 100644 --- a/hw/xprint/pcl/PclArc.c +++ b/hw/xprint/pcl/PclArc.c @@ -1,4 +1,3 @@ -/* $Xorg: PclArc.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclArea.c b/hw/xprint/pcl/PclArea.c index dc9156b17..59ae5e3cc 100644 --- a/hw/xprint/pcl/PclArea.c +++ b/hw/xprint/pcl/PclArea.c @@ -1,4 +1,3 @@ -/* $Xorg: PclArea.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclAttVal.c b/hw/xprint/pcl/PclAttVal.c index adbd197fd..f0f204764 100644 --- a/hw/xprint/pcl/PclAttVal.c +++ b/hw/xprint/pcl/PclAttVal.c @@ -1,5 +1,4 @@ /* - * $Xorg: PclAttVal.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company diff --git a/hw/xprint/pcl/PclAttr.c b/hw/xprint/pcl/PclAttr.c index 3cde053f1..b27bf4fce 100644 --- a/hw/xprint/pcl/PclAttr.c +++ b/hw/xprint/pcl/PclAttr.c @@ -1,4 +1,3 @@ -/* $Xorg: PclAttr.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclColor.c b/hw/xprint/pcl/PclColor.c index 37d42a521..8b05da056 100644 --- a/hw/xprint/pcl/PclColor.c +++ b/hw/xprint/pcl/PclColor.c @@ -1,4 +1,3 @@ -/* $Xorg: PclColor.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclCursor.c b/hw/xprint/pcl/PclCursor.c index f50c355e9..a3eeb1610 100644 --- a/hw/xprint/pcl/PclCursor.c +++ b/hw/xprint/pcl/PclCursor.c @@ -1,4 +1,3 @@ -/* $Xorg: PclCursor.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclDef.h b/hw/xprint/pcl/PclDef.h index 275bd63ec..dcd54c4fe 100644 --- a/hw/xprint/pcl/PclDef.h +++ b/hw/xprint/pcl/PclDef.h @@ -1,4 +1,3 @@ -/* $Xorg: PclDef.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c index 591435faa..716c48d6d 100644 --- a/hw/xprint/pcl/PclFonts.c +++ b/hw/xprint/pcl/PclFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PclFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclGC.c b/hw/xprint/pcl/PclGC.c index c47986eed..ba82c566a 100644 --- a/hw/xprint/pcl/PclGC.c +++ b/hw/xprint/pcl/PclGC.c @@ -1,4 +1,3 @@ -/* $Xorg: PclGC.c,v 1.4 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c index 272f4da9a..734ec5f27 100644 --- a/hw/xprint/pcl/PclInit.c +++ b/hw/xprint/pcl/PclInit.c @@ -1,4 +1,3 @@ -/* $Xorg: PclInit.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -76,7 +75,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.11 2001/12/21 21:02:05 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclLine.c b/hw/xprint/pcl/PclLine.c index f2b564df8..52a586d17 100644 --- a/hw/xprint/pcl/PclLine.c +++ b/hw/xprint/pcl/PclLine.c @@ -1,4 +1,3 @@ -/* $Xorg: PclLine.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclMisc.c b/hw/xprint/pcl/PclMisc.c index 3a958e783..e0b7dced9 100644 --- a/hw/xprint/pcl/PclMisc.c +++ b/hw/xprint/pcl/PclMisc.c @@ -1,4 +1,3 @@ -/* $Xorg: PclMisc.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclPixel.c b/hw/xprint/pcl/PclPixel.c index bfad618ed..f41af272f 100644 --- a/hw/xprint/pcl/PclPixel.c +++ b/hw/xprint/pcl/PclPixel.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPixel.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclPolygon.c b/hw/xprint/pcl/PclPolygon.c index 41ba4b1c0..9867758bb 100644 --- a/hw/xprint/pcl/PclPolygon.c +++ b/hw/xprint/pcl/PclPolygon.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPolygon.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclPrint.c b/hw/xprint/pcl/PclPrint.c index 701710253..176a0025a 100644 --- a/hw/xprint/pcl/PclPrint.c +++ b/hw/xprint/pcl/PclPrint.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPrint.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -43,7 +42,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclSFonts.c b/hw/xprint/pcl/PclSFonts.c index 287c5c14f..2474d90d7 100644 --- a/hw/xprint/pcl/PclSFonts.c +++ b/hw/xprint/pcl/PclSFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PclSFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclSFonts.h b/hw/xprint/pcl/PclSFonts.h index fdd62f651..c991263df 100644 --- a/hw/xprint/pcl/PclSFonts.h +++ b/hw/xprint/pcl/PclSFonts.h @@ -1,4 +1,3 @@ -/* $Xorg: PclSFonts.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/hw/xprint/pcl/PclSpans.c b/hw/xprint/pcl/PclSpans.c index 51c0137fc..4951899ab 100644 --- a/hw/xprint/pcl/PclSpans.c +++ b/hw/xprint/pcl/PclSpans.c @@ -1,4 +1,3 @@ -/* $Xorg: PclSpans.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclText.c b/hw/xprint/pcl/PclText.c index be794772c..246c0195b 100644 --- a/hw/xprint/pcl/PclText.c +++ b/hw/xprint/pcl/PclText.c @@ -1,4 +1,3 @@ -/* $Xorg: PclText.c,v 1.5 2001/03/06 16:28:48 pookie Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c index cac5826e9..adf03da8d 100644 --- a/hw/xprint/pcl/PclWindow.c +++ b/hw/xprint/pcl/PclWindow.c @@ -1,4 +1,3 @@ -/* $Xorg: PclWindow.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/Pclmap.h b/hw/xprint/pcl/Pclmap.h index 5224fd9e3..ae88b5a42 100644 --- a/hw/xprint/pcl/Pclmap.h +++ b/hw/xprint/pcl/Pclmap.h @@ -1,4 +1,3 @@ -/* $Xorg: Pclmap.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.5 2001/07/25 15:05:00 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/ps/Makefile.am b/hw/xprint/ps/Makefile.am index 0e8193743..08638b19d 100644 --- a/hw/xprint/ps/Makefile.am +++ b/hw/xprint/ps/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libps.la INCLUDES = -I$(top_srcdir)/hw/xprint AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT + -D_XP_PRINT_SERVER_ -DXP_PSTEXT libps_la_SOURCES = \ PsArc.c \ diff --git a/hw/xprint/ps/Ps.h b/hw/xprint/ps/Ps.h index 4effc2066..3adad39e4 100644 --- a/hw/xprint/ps/Ps.h +++ b/hw/xprint/ps/Ps.h @@ -1,4 +1,3 @@ -/* $Xorg: Ps.h,v 1.5 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsArc.c b/hw/xprint/ps/PsArc.c index 511971e7a..0684307dd 100644 --- a/hw/xprint/ps/PsArc.c +++ b/hw/xprint/ps/PsArc.c @@ -1,4 +1,3 @@ -/* $Xorg: PsArc.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsArea.c b/hw/xprint/ps/PsArea.c index bf6f8f42a..6ab9fa25c 100644 --- a/hw/xprint/ps/PsArea.c +++ b/hw/xprint/ps/PsArea.c @@ -1,4 +1,3 @@ -/* $Xorg: PsArea.c,v 1.6 2001/03/14 18:27:44 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsAttVal.c b/hw/xprint/ps/PsAttVal.c index fc23ffef5..de2e6c8e4 100644 --- a/hw/xprint/ps/PsAttVal.c +++ b/hw/xprint/ps/PsAttVal.c @@ -1,5 +1,4 @@ /* - * $Xorg: PsAttVal.c,v 1.5 2001/03/13 18:45:31 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company diff --git a/hw/xprint/ps/PsAttr.c b/hw/xprint/ps/PsAttr.c index 74da5a0e1..0925716f5 100644 --- a/hw/xprint/ps/PsAttr.c +++ b/hw/xprint/ps/PsAttr.c @@ -1,4 +1,3 @@ -/* $Xorg: PsAttr.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsColor.c b/hw/xprint/ps/PsColor.c index 91a44f85a..a91272db0 100644 --- a/hw/xprint/ps/PsColor.c +++ b/hw/xprint/ps/PsColor.c @@ -1,4 +1,3 @@ -/* $Xorg: PsColor.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsDef.h b/hw/xprint/ps/PsDef.h index cf45c8516..5af274dec 100644 --- a/hw/xprint/ps/PsDef.h +++ b/hw/xprint/ps/PsDef.h @@ -1,4 +1,3 @@ -/* $Xorg: PsDef.h,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsFonts.c b/hw/xprint/ps/PsFonts.c index c4d5b03e2..8ab631441 100644 --- a/hw/xprint/ps/PsFonts.c +++ b/hw/xprint/ps/PsFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PsFonts.c,v 1.6 2001/03/06 16:30:15 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsGC.c b/hw/xprint/ps/PsGC.c index ada0b8c65..3ec07a77a 100644 --- a/hw/xprint/ps/PsGC.c +++ b/hw/xprint/ps/PsGC.c @@ -1,4 +1,3 @@ -/* $Xorg: PsGC.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsImageUtil.c b/hw/xprint/ps/PsImageUtil.c index f3052bebb..668a23f65 100644 --- a/hw/xprint/ps/PsImageUtil.c +++ b/hw/xprint/ps/PsImageUtil.c @@ -1,5 +1,4 @@ -/* $Xorg: PsImageUtil.c,v 1.1 2005/03/25 1:19:56 gisburn Exp $ */ /* Copyright (c) 2005 Roland Mainz diff --git a/hw/xprint/ps/PsInit.c b/hw/xprint/ps/PsInit.c index 06c5d11a8..639908f73 100644 --- a/hw/xprint/ps/PsInit.c +++ b/hw/xprint/ps/PsInit.c @@ -1,4 +1,3 @@ -/* $Xorg: PsInit.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsLine.c b/hw/xprint/ps/PsLine.c index 2524769c8..aca186642 100644 --- a/hw/xprint/ps/PsLine.c +++ b/hw/xprint/ps/PsLine.c @@ -1,4 +1,3 @@ -/* $Xorg: PsLine.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsMisc.c b/hw/xprint/ps/PsMisc.c index b8a3ba854..0df039e0b 100644 --- a/hw/xprint/ps/PsMisc.c +++ b/hw/xprint/ps/PsMisc.c @@ -1,4 +1,3 @@ -/* $Xorg: PsMisc.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPixel.c b/hw/xprint/ps/PsPixel.c index 2197f0ab9..d51cb6ecf 100644 --- a/hw/xprint/ps/PsPixel.c +++ b/hw/xprint/ps/PsPixel.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPixel.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c index f2d05d023..c3259c98c 100644 --- a/hw/xprint/ps/PsPixmap.c +++ b/hw/xprint/ps/PsPixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPixmap.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPolygon.c b/hw/xprint/ps/PsPolygon.c index c4c30bc79..fe4626085 100644 --- a/hw/xprint/ps/PsPolygon.c +++ b/hw/xprint/ps/PsPolygon.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPolygon.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPrint.c b/hw/xprint/ps/PsPrint.c index 8a4f0ade8..4571c07d7 100644 --- a/hw/xprint/ps/PsPrint.c +++ b/hw/xprint/ps/PsPrint.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPrint.c,v 1.7 2001/03/14 18:28:18 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsSpans.c b/hw/xprint/ps/PsSpans.c index d7652f8fb..c0e66ee7a 100644 --- a/hw/xprint/ps/PsSpans.c +++ b/hw/xprint/ps/PsSpans.c @@ -1,4 +1,3 @@ -/* $Xorg: PsSpans.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,6 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/ps/PsText.c b/hw/xprint/ps/PsText.c index 37463ba1a..98cf15345 100644 --- a/hw/xprint/ps/PsText.c +++ b/hw/xprint/ps/PsText.c @@ -1,4 +1,3 @@ -/* $Xorg: PsText.c,v 1.7 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c index d889dda9a..1317fd704 100644 --- a/hw/xprint/ps/PsWindow.c +++ b/hw/xprint/ps/PsWindow.c @@ -1,4 +1,3 @@ -/* $Xorg: PsWindow.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/psout.c b/hw/xprint/ps/psout.c index dccd692ba..c24f88b3d 100644 --- a/hw/xprint/ps/psout.c +++ b/hw/xprint/ps/psout.c @@ -1,4 +1,3 @@ -/* $Xorg: psout.c,v 1.9 2001/03/26 15:25:12 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/psout.h b/hw/xprint/ps/psout.h index d998e2a09..3e19d5a67 100644 --- a/hw/xprint/ps/psout.h +++ b/hw/xprint/ps/psout.h @@ -1,4 +1,3 @@ -/* $Xorg: psout.h,v 1.6 2001/02/09 02:04:37 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/raster/Makefile.am b/hw/xprint/raster/Makefile.am index bf5471df6..1ee1122f2 100644 --- a/hw/xprint/raster/Makefile.am +++ b/hw/xprint/raster/Makefile.am @@ -2,8 +2,7 @@ noinst_LTLIBRARIES = libraster.la INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ libraster_la_SOURCES = \ RasterAttVal.c \ diff --git a/hw/xprint/raster/Raster.c b/hw/xprint/raster/Raster.c index 7ad30b446..0286a18fa 100644 --- a/hw/xprint/raster/Raster.c +++ b/hw/xprint/raster/Raster.c @@ -1,4 +1,3 @@ -/* $Xorg: Raster.c,v 1.4 2001/03/14 18:46:12 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -31,7 +30,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.11tsi Exp $ */ /******************************************************************* ** diff --git a/hw/xprint/raster/Raster.h b/hw/xprint/raster/Raster.h index 25da756e5..7a613f0b0 100644 --- a/hw/xprint/raster/Raster.h +++ b/hw/xprint/raster/Raster.h @@ -1,4 +1,3 @@ -/* $Xorg: Raster.h,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/raster/RasterAttVal.c b/hw/xprint/raster/RasterAttVal.c index fc00cde5a..8189be47c 100644 --- a/hw/xprint/raster/RasterAttVal.c +++ b/hw/xprint/raster/RasterAttVal.c @@ -1,4 +1,3 @@ -/* $Xorg: RasterAttVal.c,v 1.4 2001/03/14 18:46:34 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/hw/xprint/spooler.c b/hw/xprint/spooler.c index f709c57ab..e3022b0c4 100644 --- a/hw/xprint/spooler.c +++ b/hw/xprint/spooler.c @@ -1,5 +1,4 @@ -/* $Xorg: spooler.c,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */ /* Copyright (c) 2003-2004 Roland Mainz Copyright (c) 2004 Sun Microsystems, Inc. diff --git a/hw/xprint/spooler.h b/hw/xprint/spooler.h index 4e9b4aefc..4e056ceeb 100644 --- a/hw/xprint/spooler.h +++ b/hw/xprint/spooler.h @@ -6,7 +6,6 @@ #ifndef SPOOLER_H #define SPOOLER_H 1 -/* $Xorg: spooler.h,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */ /* Copyright (c) 2003-2004 Roland Mainz diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c index 3be84efc6..f4796e079 100644 --- a/hw/xwin/InitInput.c +++ b/hw/xwin/InitInput.c @@ -26,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 816dec9ed..b64eee9c7 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -26,7 +26,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 9baee9b05..09a9fb295 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -31,7 +31,6 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.37 2003/10/02 13:30:09 eich Exp $ */ #ifndef _WIN_H_ #define _WIN_H_ diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c index 7b4814b9b..f4decfb59 100644 --- a/hw/xwin/winallpriv.c +++ b/hw/xwin/winallpriv.c @@ -28,7 +28,6 @@ * Authors: Keith Packard, MIT X Consortium * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index b3b99b1b5..7ebe00244 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 514dfdc84..e3d18083e 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -27,7 +27,6 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index 2036267b8..c1e619bf8 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c index 43ccde67c..7e3966965 100644 --- a/hw/xwin/winfillsp.c +++ b/hw/xwin/winfillsp.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c index ec9d51a17..03f7f1012 100644 --- a/hw/xwin/wingetsp.c +++ b/hw/xwin/wingetsp.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index 3161e1f82..164e39160 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h index f42e09fd7..09eed1491 100644 --- a/hw/xwin/winkeybd.h +++ b/hw/xwin/winkeybd.h @@ -29,7 +29,6 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.1 2001/09/26 13:00:34 alanh Exp $ */ /* * We need symbols for the scan codes of keys. diff --git a/hw/xwin/winkeymap.h b/hw/xwin/winkeymap.h old mode 100755 new mode 100644 index 31e6cf21b..0c633cdfc --- a/hw/xwin/winkeymap.h +++ b/hw/xwin/winkeymap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.19 2002/05/31 18:45:58 dawes Exp $ */ /* * * For Scancodes see notes in winkeynames.h !!!! diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h old mode 100755 new mode 100644 index f3af1907e..6d480a3f9 --- a/hw/xwin/winkeynames.h +++ b/hw/xwin/winkeynames.h @@ -1,6 +1,5 @@ #ifndef _WINKEYNAMES_H #define _WINKEYNAMES_H -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.18 2001/09/29 20:40:30 herrb Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index 818652da6..f0092e9a8 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c old mode 100755 new mode 100644 index 5692b29c7..45ed093ec --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -27,7 +27,6 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c old mode 100755 new mode 100644 index 0b9650e98..33deae337 --- a/hw/xwin/winmultiwindowshape.c +++ b/hw/xwin/winmultiwindowshape.c @@ -28,7 +28,6 @@ * Authors: Kensuke Matsuzaki * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index f1ab55252..dc8e38bae 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -29,7 +29,6 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 03f179345..1918e54d1 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -27,7 +27,6 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ /* X headers */ #ifdef HAVE_XWIN_CONFIG_H diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c old mode 100755 new mode 100644 index e12b7f42c..045adbac6 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -29,7 +29,6 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c index c67f1c7e5..48a467a2c 100644 --- a/hw/xwin/winnativegdi.c +++ b/hw/xwin/winnativegdi.c @@ -27,7 +27,6 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c index d9d69039d..13fc1058d 100644 --- a/hw/xwin/winpfbdd.c +++ b/hw/xwin/winpfbdd.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c index 2780a3921..baff60c92 100644 --- a/hw/xwin/winpixmap.c +++ b/hw/xwin/winpixmap.c @@ -28,7 +28,6 @@ * Authors: drewry, september 1986 * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c index 594933986..72ef2d559 100644 --- a/hw/xwin/winpushpxl.c +++ b/hw/xwin/winpushpxl.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.11 2001/01/17 22:37:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index a18139c28..a9b061af6 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -31,7 +31,6 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c index 65b90ea39..8a3faee93 100644 --- a/hw/xwin/winsetsp.c +++ b/hw/xwin/winsetsp.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index 607a0674a..a2c1dc9b0 100644 --- a/hw/xwin/winshaddd.c +++ b/hw/xwin/winshaddd.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index 960cd2d70..47cc382e9 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index c0200ab53..e1eece34a 100644 --- a/hw/xwin/winwakeup.c +++ b/hw/xwin/winwakeup.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index be160196a..e844dbfb3 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index d0499bcbb..9c49d6482 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -29,7 +29,6 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.3 2003/10/02 13:30:11 eich Exp $ */ #ifndef NO #define NO 0 diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 14893f6d3..2974c41ed 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -31,7 +31,6 @@ * Harold L Hunt II * MATSUZAKI Kensuke */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include diff --git a/include/XIstubs.h b/include/XIstubs.h index e005493c4..45f6eb10c 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/bstore.h b/include/bstore.h index 098abcd86..843d6bb35 100644 --- a/include/bstore.h +++ b/include/bstore.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.1 1998/04/05 16:44:25 robin Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/bstorestr.h b/include/bstorestr.h index 8f21855c4..14e2fe1da 100644 --- a/include/bstorestr.h +++ b/include/bstorestr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/closestr.h b/include/closestr.h index d70f754b2..8855a5f93 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -1,4 +1,3 @@ -/* $Xorg: closestr.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */ #ifndef CLOSESTR_H diff --git a/include/closure.h b/include/closure.h index 839303c96..b261f5e0d 100644 --- a/include/closure.h +++ b/include/closure.h @@ -1,4 +1,3 @@ -/* $Xorg: closure.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/colormap.h b/include/colormap.h index 1f2c33075..8513c0a09 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ #ifndef CMAP_H #define CMAP_H 1 diff --git a/include/colormapst.h b/include/colormapst.h index fdfc8f397..c9d9514ad 100644 --- a/include/colormapst.h +++ b/include/colormapst.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Xorg: colormapst.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ #ifndef CMAPSTRUCT_H #define CMAPSTRUCT_H 1 diff --git a/include/cursor.h b/include/cursor.h index d51cc79e6..bdf4fd301 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.2 2004/04/23 19:54:23 eich Exp $ */ -/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cursor.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef CURSOR_H #define CURSOR_H diff --git a/include/cursorstr.h b/include/cursorstr.h index c877d6cc9..b7beaa0c5 100644 --- a/include/cursorstr.h +++ b/include/cursorstr.h @@ -1,4 +1,3 @@ -/* $Xorg: cursorstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */ #ifndef CURSORSTRUCT_H #define CURSORSTRUCT_H diff --git a/include/dix.h b/include/dix.h index 84fc84926..99f77f404 100644 --- a/include/dix.h +++ b/include/dix.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: dix.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef DIX_H #define DIX_H diff --git a/include/dixevents.h b/include/dixevents.h index 46a5faef0..2a9458f08 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/dixfont.h b/include/dixfont.h index c6b8676da..709da6272 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -1,4 +1,3 @@ -/* $Xorg: dixfont.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */ #ifndef DIXFONT_H #define DIXFONT_H 1 diff --git a/include/dixfontstr.h b/include/dixfontstr.h index 948bf1adb..463b2fdc5 100644 --- a/include/dixfontstr.h +++ b/include/dixfontstr.h @@ -1,4 +1,3 @@ -/* $Xorg: dixfontstr.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/include/dixgrabs.h b/include/dixgrabs.h index 042e063db..2d66d6ba1 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/dixstruct.h b/include/dixstruct.h index f38a64d07..9645a9be3 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ #ifndef DIXSTRUCT_H #define DIXSTRUCT_H diff --git a/include/exevents.h b/include/exevents.h index 91c7acb6b..1169a6c4e 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/extension.h b/include/extension.h index 613076dea..6e6081740 100644 --- a/include/extension.h +++ b/include/extension.h @@ -1,4 +1,3 @@ -/* $Xorg: extension.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ #ifndef EXTENSION_H #define EXTENSION_H diff --git a/include/extinit.h b/include/extinit.h index 37fa9a245..b1a0f215d 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/extnsionst.h b/include/extnsionst.h index daf37bf43..8873f0cf9 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -1,4 +1,3 @@ -/* $Xorg: extnsionst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H diff --git a/include/gc.h b/include/gc.h index 77c2f20c6..6c7add620 100644 --- a/include/gc.h +++ b/include/gc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: gc.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef GC_H #define GC_H diff --git a/include/gcstruct.h b/include/gcstruct.h index 1d0072674..14f747836 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -1,4 +1,3 @@ -/* $Xorg: gcstruct.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ #ifndef GCSTRUCT_H #define GCSTRUCT_H diff --git a/include/globals.h b/include/globals.h index d396d19c8..821b12bdb 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/include/globals.h,v 1.11 2006/04/05 21:08:45 fredrik Exp $ */ -/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ #ifndef _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index e32182d4c..c0cee2458 100644 --- a/include/input.h +++ b/include/input.h @@ -1,4 +1,3 @@ -/* $Xorg: input.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ #ifndef INPUT_H #define INPUT_H diff --git a/include/inputstr.h b/include/inputstr.h index b54e8a1d5..5e2e26968 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ********************************************************/ -/* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef INPUTSTRUCT_H #define INPUTSTRUCT_H diff --git a/include/misc.h b/include/misc.h index 199ad5da2..2be1d66a6 100644 --- a/include/misc.h +++ b/include/misc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -66,7 +65,6 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: misc.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef MISC_H #define MISC_H 1 /* diff --git a/include/miscstruct.h b/include/miscstruct.h index 6a16007b7..c39f03ce8 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -1,4 +1,3 @@ -/* $Xorg: miscstruct.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */ #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 diff --git a/include/opaque.h b/include/opaque.h index ca29afdc0..bb5bc5e53 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -1,4 +1,3 @@ -/* $Xorg: opaque.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */ #ifndef OPAQUE_H #define OPAQUE_H diff --git a/include/os.h b/include/os.h index e16839c74..4c4967164 100644 --- a/include/os.h +++ b/include/os.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: os.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef OS_H #define OS_H diff --git a/include/pixmap.h b/include/pixmap.h index 6cea329ec..3276fadb6 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -1,4 +1,3 @@ -/* $Xorg: pixmap.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 291f2a2e9..628465b97 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -1,4 +1,3 @@ -/* $Xorg: pixmapstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/property.h b/include/property.h index 21a38d51c..8b6dc0912 100644 --- a/include/property.h +++ b/include/property.h @@ -1,4 +1,3 @@ -/* $Xorg: property.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */ #ifndef PROPERTY_H #define PROPERTY_H diff --git a/include/propertyst.h b/include/propertyst.h index 9502a7261..6add81d9a 100644 --- a/include/propertyst.h +++ b/include/propertyst.h @@ -1,4 +1,3 @@ -/* $Xorg: propertyst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */ #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H diff --git a/include/region.h b/include/region.h index 0340b0db6..e9d7e778c 100644 --- a/include/region.h +++ b/include/region.h @@ -1,4 +1,3 @@ -/* $Xorg: region.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/regionstr.h b/include/regionstr.h index f3b4ce6db..6c39324d1 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/include/regionstr.h,v 1.7 2005/08/24 11:18:31 daniels Exp $ */ -/* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */ #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H diff --git a/include/resource.h b/include/resource.h index 49c189869..f513141c0 100644 --- a/include/resource.h +++ b/include/resource.h @@ -1,4 +1,3 @@ -/* $Xorg: resource.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 diff --git a/include/rgb.h b/include/rgb.h index 5741a4efa..3e768b615 100644 --- a/include/rgb.h +++ b/include/rgb.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: rgb.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef RGB_H #define RGB_H diff --git a/include/screenint.h b/include/screenint.h index 74d5e14a0..e60c2480c 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -1,4 +1,3 @@ -/* $Xorg: screenint.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ #ifndef SCREENINT_H #define SCREENINT_H diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 19abe33a1..36135153f 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -1,4 +1,3 @@ -/* $Xorg: scrnintstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ #ifndef SCREENINTSTRUCT_H #define SCREENINTSTRUCT_H diff --git a/include/selection.h b/include/selection.h index 9e6edfbd9..fbe7cfca6 100644 --- a/include/selection.h +++ b/include/selection.h @@ -1,4 +1,3 @@ -/* $Xorg: selection.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ #ifndef SELECTION_H #define SELECTION_H 1 diff --git a/include/servermd.h b/include/servermd.h index 3a3bc5f65..e6ca11ed2 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.56tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ -/* $XdotOrg: xc/programs/Xserver/include/servermd.h,v 1.4 2005/05/21 07:46:38 alanc Exp $ */ #ifndef SERVERMD_H #define SERVERMD_H 1 diff --git a/include/site.h b/include/site.h index be8c003da..5b9f25815 100644 --- a/include/site.h +++ b/include/site.h @@ -1,4 +1,3 @@ -/* $Xorg: site.h,v 1.6 2001/02/09 02:05:16 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */ #ifndef SITE_H #define SITE_H diff --git a/include/swaprep.h b/include/swaprep.h index d18b39f0c..8a9dcf036 100644 --- a/include/swaprep.h +++ b/include/swaprep.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/swapreq.h b/include/swapreq.h index 9c59bbf84..9c785fe62 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.3 2003/04/27 21:31:05 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/validate.h b/include/validate.h index 467533d22..e88fb41a2 100644 --- a/include/validate.h +++ b/include/validate.h @@ -1,4 +1,3 @@ -/* $Xorg: validate.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /* @@ -24,7 +23,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */ #ifndef VALIDATE_H #define VALIDATE_H diff --git a/include/window.h b/include/window.h index 6464f1b0c..bddeb252b 100644 --- a/include/window.h +++ b/include/window.h @@ -1,4 +1,3 @@ -/* $Xorg: window.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/windowstr.h b/include/windowstr.h index 89e3ee10b..a37dc6b75 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -1,4 +1,3 @@ -/* $Xorg: windowstr.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */ #ifndef WINDOWSTRUCT_H #define WINDOWSTRUCT_H diff --git a/mfb/fastblt.h b/mfb/fastblt.h index 08846a41f..35ba5a2a1 100644 --- a/mfb/fastblt.h +++ b/mfb/fastblt.h @@ -1,4 +1,3 @@ -/* $Xorg: fastblt.h,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.4 2001/01/17 22:37:01 dawes Exp $ */ /* * Fast bitblt macros for certain hardware. If your machine has an addressing diff --git a/mfb/maskbits.c b/mfb/maskbits.c index d2a90962d..85b5f3048 100644 --- a/mfb/maskbits.c +++ b/mfb/maskbits.c @@ -1,4 +1,3 @@ -/* $Xorg: maskbits.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* @@ -48,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.5 2001/01/17 22:37:01 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/maskbits.h b/mfb/maskbits.h index d5e1eba58..36a611fe7 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.8tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.1, 1/24/89 */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -22,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: maskbits.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mergerop.h b/mfb/mergerop.h index c8652eb81..b71bfcc09 100644 --- a/mfb/mergerop.h +++ b/mfb/mergerop.h @@ -1,5 +1,4 @@ /* - * $Xorg: mergerop.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfb.h b/mfb/mfb.h index 3135f447b..f597b16a5 100644 --- a/mfb/mfb.h +++ b/mfb/mfb.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.21 2003/07/16 03:35:16 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfb.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #if !defined(_MFB_H_) || defined(MFB_PROTOTYPES_ONLY) #ifndef MFB_PROTOTYPES_ONLY diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 58468e3e5..0f84df354 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.7tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbitblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index e66ab6090..4c3028126 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -1,7 +1,6 @@ /* * mfb copy area */ -/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.3 2001/10/28 03:34:14 tsi Exp $ */ /* @@ -30,7 +29,6 @@ in this Software without prior written authorization from The Open Group. Author: Keith Packard */ -/* $Xorg: mfbblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index 07c59d184..ee2f10f33 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -1,5 +1,4 @@ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ -/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index 266111e65..3904c0db1 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbbstore.c b/mfb/mfbbstore.c index 270aa78fd..784df4e84 100644 --- a/mfb/mfbbstore.c +++ b/mfb/mfbbstore.c @@ -1,4 +1,3 @@ -/* $Xorg: mfbbstore.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 2b8a9cea2..48e532aa8 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index a16964e15..4dabcae1a 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.7tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbcmap.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index ffa948fe1..30ec00dc3 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.5 2001/12/14 20:00:06 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mfbfillarc.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index ba8a14283..f9209d096 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbfillrct.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index f75ccb18d..112f5327c 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.8 2001/01/17 22:37:02 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbfillsp.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbfont.c b/mfb/mfbfont.c index 3798cd22b..672b5d958 100644 --- a/mfb/mfbfont.c +++ b/mfb/mfbfont.c @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Xorg: mfbfont.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index dd20a9a36..c60e97676 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.9 2003/07/16 01:38:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbgc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index c1017e177..befe57a1f 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.3tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbgetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index 9a9d20dac..7616f9bf2 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbhrzvert.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index e2d2438c5..8861865a6 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index 0c0d4140c..e5c186b89 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbimggblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbline.c b/mfb/mfbline.c index 465dfd36e..863a6187b 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.6 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbline.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbmisc.c b/mfb/mfbmisc.c index 19ab3fa75..5154e2784 100644 --- a/mfb/mfbmisc.c +++ b/mfb/mfbmisc.c @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index 29dcf3d33..5ec8502cb 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpixmap.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* pixmap management written by drewry, september 1986 diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index 83e59cff6..4227e894f 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -1,5 +1,4 @@ /* - * $Xorg: mfbply1rct.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index 275e8c646..997e4a388 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.4tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbplygblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbpntarea.c b/mfb/mfbpntarea.c index 0719e4ebd..2906e660c 100644 --- a/mfb/mfbpntarea.c +++ b/mfb/mfbpntarea.c @@ -45,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpntarea.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbpntwin.c b/mfb/mfbpntwin.c index d1c19b691..b18797a40 100644 --- a/mfb/mfbpntwin.c +++ b/mfb/mfbpntwin.c @@ -1,4 +1,3 @@ -/* $Xorg: mfbpntwin.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index e5ac4c874..1c4045126 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpolypnt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index 49211e6b7..ddf7b3c0e 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.6tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpushpxl.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbscrclse.c b/mfb/mfbscrclse.c index 55445932c..97ca729fb 100644 --- a/mfb/mfbscrclse.c +++ b/mfb/mfbscrclse.c @@ -1,4 +1,3 @@ -/* $Xorg: mfbscrclse.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.3tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index db48c9c10..0707c1a74 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.8tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbscrinit.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index 485b4e265..24add836c 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.6tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbsetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index ac22aee0c..ff52d8c9e 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -1,4 +1,3 @@ -/* $Xorg: mfbtegblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index ecfa06952..73015f57d 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.3 2003/02/18 21:30:01 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbtile.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index ccc07df1d..f65f45ebd 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -1,4 +1,3 @@ -/* $Xorg: mfbwindow.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index 9fd4c07a2..964e2f100 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.7 2002/09/27 01:57:47 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mfbzerarc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" diff --git a/mi/cbrt.c b/mi/cbrt.c index cfc8d84da..c703fd9d2 100644 --- a/mi/cbrt.c +++ b/mi/cbrt.c @@ -1,4 +1,3 @@ -/* $Xorg: cbrt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.3 2001/05/29 22:24:06 dawes Exp $ */ /* simple cbrt, in case your math library doesn't have a good one */ diff --git a/mi/mi.h b/mi/mi.h index 2de523372..97e1b6f3a 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -1,4 +1,3 @@ -/* $Xorg: mi.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */ #ifndef MI_H #define MI_H diff --git a/mi/miarc.c b/mi/miarc.c index f6abb3ba2..2b3a0cbbc 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/mi/miarc.c,v 1.7 2006/02/15 19:05:54 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Author: Keith Packard and Bob Scheifler */ /* Warning: this code is toxic, do not dally very long here. */ diff --git a/mi/mibank.c b/mi/mibank.c index d7cf94b49..32e963fab 100644 --- a/mi/mibank.c +++ b/mi/mibank.c @@ -44,7 +44,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.15 2003/11/10 18:39:16 tsi Exp $ */ /* * This thing originated from an idea of Edwin Goei and his bank switching diff --git a/mi/mibank.h b/mi/mibank.h index cf27d1fae..fe93ab41b 100644 --- a/mi/mibank.h +++ b/mi/mibank.h @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.10 2003/01/01 19:16:42 tsi Exp $ */ #ifndef __MIBANK_H__ #define __MIBANK_H__ 1 diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 2bccc2fb4..bf0e29ac0 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.10 2001/08/06 20:51:17 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Author: Todd Newman (aided and abetted by Mr. Drewry) */ #ifdef HAVE_DIX_CONFIG_H diff --git a/mi/mibstore.c b/mi/mibstore.c index b13ab4fc1..6653c2345 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -1,4 +1,3 @@ -/* $Xorg: mibstore.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -42,7 +41,6 @@ implied warranty. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/mi/mibstore.h b/mi/mibstore.h index fb58975c6..23abde26e 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -12,11 +12,9 @@ * software for any purpose. It is provided "as is" without * express or implied warranty. * - * "$Xorg: mibstore.h,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ #ifndef _MIBSTORE_H #define _MIBSTORE_H diff --git a/mi/mibstorest.h b/mi/mibstorest.h index 787b9d4f4..ccf4fb701 100644 --- a/mi/mibstorest.h +++ b/mi/mibstorest.h @@ -4,7 +4,6 @@ * internal structure definitions for mi backing store */ -/* $Xorg: mibstorest.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /* @@ -31,7 +30,6 @@ 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/Xserver/mi/mibstorest.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/micmap.c b/mi/micmap.c index 0e94606b9..987affe96 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -1,4 +1,3 @@ -/* $XConsortium: cfbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,7 +26,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.10 2000/09/20 00:09:14 keithp Exp $ */ /* * This is based on cfbcmap.c. The functions here are useful independently diff --git a/mi/micmap.h b/mi/micmap.h index ca2a417be..9ee9f4ae4 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */ #include "colormapst.h" diff --git a/mi/micoord.h b/mi/micoord.h index e4b242475..b3d725b73 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/micoord.h,v 1.7 2003/10/29 22:57:48 tsi Exp $ */ /* * Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/mi/micursor.c b/mi/micursor.c index 2868966e6..6e06fbc07 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: micursor.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/midash.c b/mi/midash.c index 7948a48ce..6dd161a39 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: midash.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/midispcur.c b/mi/midispcur.c index 597d27289..de009cbaf 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -4,7 +4,6 @@ * machine independent cursor display routines */ -/* $Xorg: midispcur.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /* @@ -30,7 +29,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mieq.c b/mi/mieq.c index 37662625e..a7c6f9a51 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -1,5 +1,4 @@ /* - * $Xorg: mieq.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.2 2001/05/25 18:41:01 dawes Exp $ */ /* * mieq.c diff --git a/mi/miexpose.c b/mi/miexpose.c index 85fefb21f..1ca5fc965 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/mi/miexpose.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -74,7 +72,6 @@ Equipment Corporation. ******************************************************************/ -/* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mifillarc.c b/mi/mifillarc.c index 323cd0e76..66063166a 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,7 +26,6 @@ Author: Bob Scheifler, MIT X Consortium ********************************************************/ -/* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mifillarc.h b/mi/mifillarc.h index ff39bac1d..53f6f23ea 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.6 2001/10/25 12:03:47 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mifillarc.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #ifndef __MIFILLARC_H__ #define __MIFILLARC_H__ diff --git a/mi/mifillrct.c b/mi/mifillrct.c index ce4b0e57b..78e89d69c 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 79f606b4d..8f0507601 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -1,4 +1,3 @@ -/* $Xorg: mifpoly.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */ #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index 40b83586f..57229f639 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.2 2001/08/06 20:51:18 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/migc.c b/mi/migc.c index b6c7c770e..46643ab26 100644 --- a/mi/migc.c +++ b/mi/migc.c @@ -1,4 +1,3 @@ -/* $Xorg: migc.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/migc.h b/mi/migc.h index d906c6334..84dc75c6c 100644 --- a/mi/migc.h +++ b/mi/migc.h @@ -1,4 +1,3 @@ -/* $Xorg: migc.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.7 2001/08/06 20:51:18 dawes Exp $ */ extern void miChangeGC( GCPtr /*pGC*/, diff --git a/mi/miglblt.c b/mi/miglblt.c index beca1a0b6..db299a8ae 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.5 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/miinitext.c b/mi/miinitext.c index 2c1b1e2c0..80bacaa7a 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.33 2006/06/01 18:47:01 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miinitext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/miline.h b/mi/miline.h index f52a51ebd..7028485f0 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -1,4 +1,3 @@ -/* $Xorg: miline.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* @@ -25,7 +24,6 @@ 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/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MILINE_H diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 88b3bf81d..c02ea2dc5 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mioverlay.h b/mi/mioverlay.h index a1d1e1a18..24b74f51c 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mipointer.c b/mi/mipointer.c index 4602d4703..1715965fa 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -2,7 +2,6 @@ * mipointer.c */ -/* $Xorg: mipointer.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* @@ -28,7 +27,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mipointer.h b/mi/mipointer.h index ad4be69c2..aae38377c 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -3,7 +3,6 @@ * */ -/* $Xorg: mipointer.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* @@ -29,7 +28,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/mi/mipointrst.h b/mi/mipointrst.h index 682f8ac88..f1fbfe4f9 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -3,7 +3,6 @@ * */ -/* $Xorg: mipointrst.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* @@ -29,7 +28,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */ #include "mipointer.h" #include "scrnintstr.h" diff --git a/mi/mipoly.c b/mi/mipoly.c index 3a968e47f..b514b5ed2 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -45,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipoly.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* * mipoly.c * diff --git a/mi/mipoly.h b/mi/mipoly.h index 88a1782de..8e04f6737 100644 --- a/mi/mipoly.h +++ b/mi/mipoly.h @@ -1,4 +1,3 @@ -/* $Xorg: mipoly.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /* diff --git a/mi/mipolycon.c b/mi/mipolycon.c index 428fc3f96..b5ab89364 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mipolygen.c b/mi/mipolygen.c index c3d9ef397..34da21f9e 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index 797c19773..245bda317 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 233ba2130..a9ab90928 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index 2a37e8ca9..0cd9d416e 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/mipolytext.c b/mi/mipolytext.c index 2ce94fee8..6af02e046 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /******************************************************************* Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************/ -/* $Xorg: mipolytext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* * mipolytext.c - text routines * diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index be62250ee..5443ba5c3 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.9 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyutil.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index d83d2fc6a..6526aa02b 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.12 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/miregion.c b/mi/miregion.c index 0a6913f3c..fdb538c68 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.9 2003/04/23 21:51:53 tsi Exp $ */ /*********************************************************** Copyright 1987, 1988, 1989, 1998 The Open Group @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miregion.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ /***************************************************************** diff --git a/mi/miscanfill.h b/mi/miscanfill.h index 49058c1c9..e318c45b4 100644 --- a/mi/miscanfill.h +++ b/mi/miscanfill.h @@ -1,4 +1,3 @@ -/* $Xorg: miscanfill.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group diff --git a/mi/miscrinit.c b/mi/miscrinit.c index ed40fc4fc..ac1b82336 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -1,4 +1,3 @@ -/* $Xorg: miscrinit.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mispans.c b/mi/mispans.c index 48252f323..4c8b6d698 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.3 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mispans.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mispans.h b/mi/mispans.h index b6e97e2b4..5b141afe2 100644 --- a/mi/mispans.h +++ b/mi/mispans.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mispans.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ typedef struct { int count; /* number of spans */ diff --git a/mi/misprite.c b/mi/misprite.c index d0973ff46..286c7552a 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -4,7 +4,6 @@ * machine independent software sprite routines */ -/* $Xorg: misprite.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* @@ -30,7 +29,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/mi/misprite.c,v 3.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/misprite.h b/mi/misprite.h index b4cc84ecf..5173b7736 100644 --- a/mi/misprite.h +++ b/mi/misprite.h @@ -6,7 +6,6 @@ * mi versions of these routines exist. */ -/* $Xorg: misprite.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* @@ -32,7 +31,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/mi/misprite.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ typedef struct { Bool (*RealizeCursor)( diff --git a/mi/mispritest.h b/mi/mispritest.h index dca1fa619..5075f0580 100644 --- a/mi/mispritest.h +++ b/mi/mispritest.h @@ -4,7 +4,6 @@ * mi sprite structures */ -/* $Xorg: mispritest.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* @@ -30,7 +29,6 @@ Except as contained in this notice, the name of The Open Group shall 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/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/mi/mistruct.h b/mi/mistruct.h index 98879b72d..9b9de8677 100644 --- a/mi/mistruct.h +++ b/mi/mistruct.h @@ -1,4 +1,3 @@ -/* $Xorg: mistruct.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mivalidate.h b/mi/mivalidate.h index 612b67e1d..91858328a 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -1,4 +1,3 @@ -/* $Xorg: mivalidate.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group diff --git a/mi/mivaltree.c b/mi/mivaltree.c index 08ad4acae..0e5ed61e7 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -1,5 +1,3 @@ -/* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ -/* $XdotOrg: xserver/xorg/mi/mivaltree.c,v 1.7 2006/02/15 19:05:54 ajax Exp $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function @@ -81,7 +79,6 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.9tsi Exp $ */ /* * Aug '86: Susan Angebranndt -- original code diff --git a/mi/miwideline.c b/mi/miwideline.c index 3554e3e8e..d57c2eaa7 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -1,4 +1,3 @@ -/* $Xorg: miwideline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.12 2001/12/14 20:00:28 dawes Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwideline.h b/mi/miwideline.h index 96d6aae86..8cfa63008 100644 --- a/mi/miwideline.h +++ b/mi/miwideline.h @@ -1,4 +1,3 @@ -/* $Xorg: miwideline.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.11 2001/10/25 12:03:47 alanh Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwindow.c b/mi/miwindow.c index 47ba433fa..cd6bb8df3 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.9tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/mi/mizerarc.c b/mi/mizerarc.c index f55afee23..33e1acc19 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.6 2001/12/14 20:00:28 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,7 +26,6 @@ Author: Bob Scheifler, MIT X Consortium ********************************************************/ -/* $Xorg: mizerarc.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" diff --git a/mi/mizerarc.h b/mi/mizerarc.h index 99062d192..8119d885e 100644 --- a/mi/mizerarc.h +++ b/mi/mizerarc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mizerarc.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ typedef struct { int x; diff --git a/mi/mizerclip.c b/mi/mizerclip.c index 768936dbd..b167c5475 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mizerline.c b/mi/mizerline.c index 56f31d69d..073f1b20f 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.6 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include #endif diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c index 4c780f526..d62bee740 100644 --- a/miext/rootless/accel/rlAccel.c +++ b/miext/rootless/accel/rlAccel.c @@ -26,7 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xserver/xorg/miext/rootless/accel/rlAccel.c,v 1.5 2005/07/03 07:02:03 daniels Exp $ */ /* * The accelerated rootless code replaces some GC operations from fb with diff --git a/miext/rootless/accel/rlAccel.h b/miext/rootless/accel/rlAccel.h index a4402bdf2..a3fc6321e 100644 --- a/miext/rootless/accel/rlAccel.h +++ b/miext/rootless/accel/rlAccel.h @@ -26,7 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c index e5fa5f7bd..d1e765836 100644 --- a/miext/rootless/accel/rlBlt.c +++ b/miext/rootless/accel/rlBlt.c @@ -26,7 +26,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c index ccea7fbd3..df6fc11a7 100644 --- a/miext/rootless/accel/rlCopy.c +++ b/miext/rootless/accel/rlCopy.c @@ -22,7 +22,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c index a6ed2fbbb..0d0d01251 100644 --- a/miext/rootless/accel/rlFill.c +++ b/miext/rootless/accel/rlFill.c @@ -22,7 +22,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c index e4bab4f53..6efed3bd9 100644 --- a/miext/rootless/accel/rlFillRect.c +++ b/miext/rootless/accel/rlFillRect.c @@ -22,7 +22,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c index 9942d70e4..ab8bff065 100644 --- a/miext/rootless/accel/rlFillSpans.c +++ b/miext/rootless/accel/rlFillSpans.c @@ -22,7 +22,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c index 3f1571963..82cd06c7f 100644 --- a/miext/rootless/accel/rlGlyph.c +++ b/miext/rootless/accel/rlGlyph.c @@ -22,7 +22,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c index edce3d2c4..fa4160f38 100644 --- a/miext/rootless/accel/rlSolid.c +++ b/miext/rootless/accel/rlSolid.c @@ -26,7 +26,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index dec0e2c64..f83defeb6 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -27,7 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.7 2004/07/02 01:30:33 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c index 33321105e..8fd922d4a 100644 --- a/miext/rootless/rootlessCommon.c +++ b/miext/rootless/rootlessCommon.c @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.6 2004/07/02 01:30:33 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index beb1fd666..3bf6af02f 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -27,7 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.5 2004/07/02 01:30:33 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index eabbaef43..3e326bf06 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -26,7 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index 32ffbf13b..5341267fb 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 6b7697383..356fec798 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.2 2003/04/30 23:15:35 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index 2717ddf6f..97348f58e 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -3,7 +3,6 @@ * * This file is very closely based on mivaltree.c. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.1tsi Exp $ */ /* * mivaltree.c -- diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index f105a9113..e89ebf897 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.4 2004/10/08 00:35:08 torrey Exp $ */ /* * Rootless window management */ @@ -29,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.12 2004/07/02 01:30:33 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index 9cceed347..093a2b384 100644 --- a/miext/rootless/rootlessWindow.h +++ b/miext/rootless/rootlessWindow.h @@ -26,7 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/miext/rootless/safeAlpha/safeAlpha.h b/miext/rootless/safeAlpha/safeAlpha.h index 63922aeec..bd1ce3203 100644 --- a/miext/rootless/safeAlpha/safeAlpha.h +++ b/miext/rootless/safeAlpha/safeAlpha.h @@ -26,7 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.2 2003/10/18 00:00:34 torrey Exp $ */ #ifndef _SAFEALPHA_H #define _SAFEALPHA_H diff --git a/miext/rootless/safeAlpha/safeAlphaPicture.c b/miext/rootless/safeAlpha/safeAlphaPicture.c index f73a3b5c1..8550cc01f 100644 --- a/miext/rootless/safeAlpha/safeAlphaPicture.c +++ b/miext/rootless/safeAlpha/safeAlphaPicture.c @@ -32,7 +32,6 @@ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. */ - /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.3 2003/10/24 00:33:15 torrey Exp $ */ #ifdef RENDER diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c index 1647896bc..8884c107e 100644 --- a/miext/rootless/safeAlpha/safeAlphaWindow.c +++ b/miext/rootless/safeAlpha/safeAlphaWindow.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.3 2004/12/04 00:43:12 kuhn Exp $ */ /* * Specialized window functions to protect the alpha channel */ @@ -32,7 +31,6 @@ * * Copyright © 1998 Keith Packard */ -/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1 2003/09/16 00:36:20 torrey Exp $ */ #include "fb.h" #include "safeAlpha.h" diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index b93e810dc..8986809f4 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.6tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 1af55bbc4..678f8c629 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.4 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index 529f35c57..b5983dc73 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index 8db584b43..6d8defa58 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index 8e46fcecf..673cd76b5 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.4tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index 7f3f24111..015a98595 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/os/WaitFor.c b/os/WaitFor.c index f7921c3d9..045767809 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: WaitFor.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /***************************************************************** * OS Dependent input routines: diff --git a/os/access.c b/os/access.c index 5946b166d..81f5b7403 100644 --- a/os/access.c +++ b/os/access.c @@ -1,5 +1,3 @@ -/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ -/* $XdotOrg: xserver/xorg/os/access.c,v 1.15 2006/02/15 20:44:13 ajax Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -55,7 +53,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/auth.c b/os/auth.c index d170ef8d8..bf33b7ef1 100644 --- a/os/auth.c +++ b/os/auth.c @@ -1,4 +1,3 @@ -/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: auth.c,v 1.13 2003/04/27 21:31:08 herrb Exp $ */ /* * authorization hooks for the server diff --git a/os/connection.c b/os/connection.c index ce765665f..b64cda196 100644 --- a/os/connection.c +++ b/os/connection.c @@ -1,4 +1,3 @@ -/* $Xorg: connection.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.64 2003/10/07 22:50:42 herrb Exp $ */ /***************************************************************** * Stuff to create connections --- OS dependent * diff --git a/os/io.c b/os/io.c index e95f0e6a8..f6c666c0f 100644 --- a/os/io.c +++ b/os/io.c @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: io.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */ /***************************************************************** * i/o functions * @@ -53,7 +52,6 @@ SOFTWARE. * InsertFakeRequest, ResetCurrentRequest * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/k5auth.c b/os/k5auth.c index 78301ad10..7bc0ce822 100644 --- a/os/k5auth.c +++ b/os/k5auth.c @@ -1,4 +1,3 @@ -/* $Xorg: k5auth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.4 2001/01/17 22:37:10 dawes Exp $ */ /* * Kerberos V5 authentication scheme diff --git a/os/log.c b/os/log.c index e31da9eef..05e542f08 100644 --- a/os/log.c +++ b/os/log.c @@ -76,7 +76,6 @@ OR PERFORMANCE OF THIS SOFTWARE. * authorization from the copyright holder(s) and author(s). */ -/* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/mitauth.c b/os/mitauth.c index 2f42fd41f..db66c44fb 100644 --- a/os/mitauth.c +++ b/os/mitauth.c @@ -1,4 +1,3 @@ -/* $Xorg: mitauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.4 2001/01/17 22:37:11 dawes Exp $ */ /* * MIT-MAGIC-COOKIE-1 authorization scheme diff --git a/os/oscolor.c b/os/oscolor.c index ab8baf1bf..a13a3a68c 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.10 2003/07/16 01:39:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/osdep.h b/os/osdep.h index 259237d37..5fa1e3918 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.17 2002/05/31 18:46:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: osdep.h,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/osinit.c b/os/osinit.c index 4e502830a..9a1c1133a 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.29 2003/09/09 03:20:41 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/rpcauth.c b/os/rpcauth.c index 3c5cb5946..603844aee 100644 --- a/os/rpcauth.c +++ b/os/rpcauth.c @@ -1,4 +1,3 @@ -/* $Xorg: rpcauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.7 2001/12/14 20:00:35 dawes Exp $ */ /* * SUN-DES-1 authentication mechanism diff --git a/os/secauth.c b/os/secauth.c index 8c8700812..d01879bfd 100644 --- a/os/secauth.c +++ b/os/secauth.c @@ -1,4 +1,3 @@ -/* $Xorg: secauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,7 +23,6 @@ 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/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/utils.c b/os/utils.c index ffa4958cf..def12be49 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/os/utils.c,v 1.26 2006-06-01 22:06:41 daniels Exp $ */ -/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -50,7 +48,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/os/xalloc.c b/os/xalloc.c index effe9514a..8c019f3bc 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -26,7 +26,6 @@ dealings in this Software without prior written authorization from Pascal Haible. */ -/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.35tsi Exp $ */ /* Only used if INTERNAL_MALLOC is defined * - otherwise xalloc() in utils.c is used diff --git a/os/xdmauth.c b/os/xdmauth.c index faa2e3799..d143ddefc 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -1,4 +1,3 @@ -/* $Xorg: xdmauth.c,v 1.4 2001/02/09 02:05:24 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xdmauth.c,v 1.7 2002/11/05 05:50:34 keithp Exp $ */ /* * XDM-AUTHENTICATION-1 (XDMCP authentication) and diff --git a/os/xdmcp.c b/os/xdmcp.c index 4f87097a0..fd4be5e81 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.7 2005/05/02 21:57:32 harold Exp $ */ -/* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. * @@ -14,7 +12,6 @@ * without express or implied warranty. * */ -/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/randr/mirandr.c b/randr/mirandr.c index b1e19a746..0954028d1 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.5 2001/06/04 09:45:40 keithp Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randr.c b/randr/randr.c index bcaa232c9..946aad31d 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.21tsi Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randrstr.h b/randr/randrstr.h index 9dfc71efe..27ab61abb 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.5 2002/09/29 23:39:45 keithp Exp $ * * Copyright © 2000 Compaq Computer Corporation * diff --git a/record/record.c b/record/record.c index 070a120df..0ed8f84c2 100644 --- a/record/record.c +++ b/record/record.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/record/record.c,v 1.7 2006/03/28 01:21:00 ajax Exp $ */ -/* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* @@ -33,7 +31,6 @@ This work benefited from earlier work done by Martha Zimet of NCD and Jim Haggerty of Metheus. */ -/* $XFree86: xc/programs/Xserver/record/record.c,v 1.11 2003/11/03 05:12:01 tsi Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/record/set.c b/record/set.c index dcdb263bb..7323aa0ed 100644 --- a/record/set.c +++ b/record/set.c @@ -1,4 +1,3 @@ -/* $Xorg: set.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* @@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.c,v 1.7 2001/12/14 20:00:37 dawes Exp $ */ /* diff --git a/record/set.h b/record/set.h index 6f0b872a1..f156bf8dc 100644 --- a/record/set.h +++ b/record/set.h @@ -1,4 +1,3 @@ -/* $Xorg: set.h,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* diff --git a/render/animcur.c b/render/animcur.c index e3915b2b8..8e4f59d1b 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.5tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/glyph.c b/render/glyph.c index fd9bae3ac..6d09a0e52 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.5 2001/01/30 07:01:22 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/glyphstr.h b/render/glyphstr.h index 5f38bc9cf..64cedfa16 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.3 2000/11/20 07:13:13 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miglyph.c b/render/miglyph.c index 2a221442e..7968c90ea 100644 --- a/render/miglyph.c +++ b/render/miglyph.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.4 2000/11/20 07:13:13 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miindex.c b/render/miindex.c index 03e2857a2..0e12dca4a 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.7 2002/11/05 06:05:04 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mipict.c b/render/mipict.c index 0a00a324b..3d6c1aeeb 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.15tsi Exp $ * * Copyright © 1999 Keith Packard * diff --git a/render/mipict.h b/render/mipict.h index 0d76aaf54..eef155f7d 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.12 2002/11/05 05:34:40 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/mirect.c b/render/mirect.c index 7bcdd8b62..87767a76c 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.3 2000/12/08 07:52:05 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitrap.c b/render/mitrap.c index be1712420..c6188061c 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.8 2002/09/03 19:28:28 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitri.c b/render/mitri.c index bc2641895..374e2fdc7 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.5 2002/05/31 16:48:52 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/picture.c b/render/picture.c index 55763fcc1..566d91e09 100644 --- a/render/picture.c +++ b/render/picture.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.c,v 1.29 2002/11/23 02:38:15 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/picture.h b/render/picture.h index 8184c02c0..1b622340d 100644 --- a/render/picture.h +++ b/render/picture.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.h,v 1.20tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/render.c b/render/render.c index 73522ee66..e4d8d6b32 100644 --- a/render/render.c +++ b/render/render.c @@ -1,6 +1,4 @@ -/* $XdotOrg: xserver/xorg/render/render.c,v 1.13 2006/02/10 22:00:30 anholt Exp $ */ /* - * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index 8f1f1157c..8356e47e7 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -1,4 +1,3 @@ -/* $Xorg: XKBAlloc.c,v 1.4 2000/08/17 19:44:59 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.5 2001/01/17 19:41:48 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index 3be32da9d..edaed10f3 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -1,4 +1,3 @@ -/* $Xorg: XKBGAlloc.c,v 1.3 2000/08/17 19:45:01 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index ce79ef090..ef4097dad 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -1,4 +1,3 @@ -/* $Xorg: XKBMAlloc.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 8157a3f9d..7ed47697e 100644 --- a/xkb/XKBMisc.c +++ b/xkb/XKBMisc.c @@ -1,4 +1,3 @@ -/* $Xorg: XKBMisc.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c index 429d1e778..ff9dd99cf 100644 --- a/xkb/ddxBeep.c +++ b/xkb/ddxBeep.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxBeep.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.9 2002/12/05 21:59:00 paulo Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index 2e4e106ce..5a9ad4018 100644 --- a/xkb/ddxCtrls.c +++ b/xkb/ddxCtrls.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxCtrls.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.3 2001/01/17 22:37:14 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c index d0e37f263..3de8f8721 100644 --- a/xkb/ddxDevBtn.c +++ b/xkb/ddxDevBtn.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxDevBtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.3 2001/08/23 21:49:51 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c index 73c8a2415..f7b746b05 100644 --- a/xkb/ddxFakeBtn.c +++ b/xkb/ddxFakeBtn.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxFakeBtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index be5324d0f..a19819fd7 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.3 2005/04/20 12:25:48 daniels Exp $ */ -/* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -25,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.5 2003/09/13 16:39:01 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c index 8b76b7cb1..88c488c22 100644 --- a/xkb/ddxInit.c +++ b/xkb/ddxInit.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxInit.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c index c940e5321..528b20207 100644 --- a/xkb/ddxKeyClick.c +++ b/xkb/ddxKeyClick.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxKeyClick.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c index 3dc31a433..95d75897b 100644 --- a/xkb/ddxKillSrv.c +++ b/xkb/ddxKillSrv.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxKillSrv.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index fb5f72bf8..fd0195882 100644 --- a/xkb/ddxLEDs.c +++ b/xkb/ddxLEDs.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxLEDs.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 5d8366eba..f94a869ae 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxList.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.8 2003/07/16 01:39:05 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index e355b1796..5795f8b0d 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxLoad.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.35 2003/10/02 13:30:12 eich Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c index 22d9d79fe..7450b47ba 100644 --- a/xkb/ddxPrivate.c +++ b/xkb/ddxPrivate.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c index ae46850e0..f56f0796d 100644 --- a/xkb/ddxVT.c +++ b/xkb/ddxVT.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxVT.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/maprules.c b/xkb/maprules.c index eff02ad34..b0a2225e2 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -1,4 +1,3 @@ -/* $Xorg: maprules.c,v 1.4 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkb.c b/xkb/xkb.c index 7119bb0d4..f892c431f 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -1,4 +1,3 @@ -/* $Xorg: xkb.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 96827f657..7b57611e2 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbAccessX.c,v 1.4 2001/02/05 18:50:20 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.9 2001/08/23 14:33:25 alanh Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 20277224e..0cbf8d007 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -1,5 +1,3 @@ -/* $Xorg: xkbActions.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XdotOrg: xc/programs/Xserver/xkb/xkbActions.c,v 1.4 2005/05/22 01:12:49 alanc Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -25,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.13 2003/07/16 01:39:08 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h index 2a24fe35f..e31568abb 100644 --- a/xkb/xkbDflts.h +++ b/xkb/xkbDflts.h @@ -1,5 +1,3 @@ -/* $Xorg: xkbDflts.h,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.2 2001/10/28 03:34:20 tsi Exp $ */ /* This file generated automatically by xkbcomp */ /* DO NOT EDIT */ #ifdef HAVE_DIX_CONFIG_H diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 6afe7874b..86a40e02f 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbEvents.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.11 2003/07/16 01:39:10 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index d2824da83..5aa121da2 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -1,5 +1,3 @@ -/* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XdotOrg: xserver/xorg/xkb/xkbInit.c,v 1.13 2006/03/25 22:35:48 daniels Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -25,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.32tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 6e5c3a199..ec8e7b14a 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbLEDs.c,v 1.4 2001/05/10 19:54:01 steve Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.7 2003/07/16 01:39:10 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index ee521be69..b2a7ab2c9 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbPrKeyEv.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.8 2001/01/17 22:37:15 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index 82f476790..f84e70995 100644 --- a/xkb/xkbPrOtherEv.c +++ b/xkb/xkbPrOtherEv.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbPrOtherEv.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index be1cd94fc..9a04b77d5 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbSwap.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 4c0db6f2e..ee0abbeae 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbUtils.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.16 2003/11/03 05:12:02 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c index 820edfdb6..095d573ea 100644 --- a/xkb/xkberrs.c +++ b/xkb/xkberrs.c @@ -1,4 +1,3 @@ -/* $Xorg: xkberrs.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 3ed68c267..2bec21b3f 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbmisc.c,v 1.4 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include diff --git a/xkb/xkmread.c b/xkb/xkmread.c index 198ea0c1a..5441243ed 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -1,4 +1,3 @@ -/* $Xorg: xkmread.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include -- cgit v1.2.3