[xserver-commit] xserver/mi Makefile.am,3.5.2.3,3.5.2.4 miinitext.c,3.71.2.1,3.71.2.2
Keith Packard
xserver-commit@pdx.freedesktop.org
Wed, 29 Oct 2003 08:27:28 -0800
Committed by: keithp
Update of /cvs/xserver/xserver/mi
In directory pdx:/tmp/cvs-serv23305/mi
Modified Files:
Tag: xfixes_2_branch
Makefile.am miinitext.c
Log Message:
* Xext/bigreq.c: (BigReqExtensionInit):
* Xext/mitmisc.c: (MITMiscExtensionInit):
* Xext/saver.c: (ScreenSaverExtensionInit):
* Xext/shm.c: (ShmExtensionInit), (ShmRegisterFuncs),
(ShmSetPixmapFormat):
* Xext/shmint.h:
* Xext/sleepuntil.c: (ClientSleepUntil):
* Xext/sleepuntil.h:
* Xext/sync.c: (SyncCreateSystemCounter), (SyncExtensionInit):
* Xext/syncint.h:
* Xext/xcmisc.c: (XCMiscExtensionInit):
* Xext/xext.h:
* Xext/xres.c:
* Xext/xtest.c: (XTestExtensionInit):
* Xext/xtest1di.c: (XTestExtension1Init):
* Xext/xvmc.c: (XvMCFindXvImage):
* Xext/xvmcext.h:
* configure.ac:
* dix/dispatch.c:
* dix/extension.c: (CloseDownExtensions):
* dix/property.c: (NullPropertyReply):
* dix/xpstubs.c: (XpClientIsBitmapClient), (XpClientIsPrintClient),
(XprintOptions):
* hw/kdrive/fbdev/fbdev.c: (fbdevUnmapFramebuffer),
(fbdevRandRSetConfig):
* hw/kdrive/fbdev/fbdev.h:
* hw/kdrive/linux/agp.c: (GARTInit):
* hw/kdrive/linux/bus.c:
* hw/kdrive/linux/keyboard.c: (readKernelMapping):
* hw/kdrive/linux/linux.c: (LinuxInit):
* hw/kdrive/linux/mouse.c:
* hw/kdrive/linux/ms.c:
* hw/kdrive/linux/ps2.c:
* hw/kdrive/mach64/mach64.c:
* hw/kdrive/mach64/mach64draw.c:
* hw/kdrive/mga/mga.c:
* hw/kdrive/mga/mgadraw.c: (mgaPrepareSolid), (mgaPrepareCopy):
* hw/kdrive/nvidia/nvidia.c: (nvidiaLockUnlock):
* hw/kdrive/nvidia/nvidia.h:
* hw/kdrive/nvidia/nvidiadraw.c: (nvidiaPrepareSolid),
(nvidiaPrepareCopy), (nvidiaDrawInit), (nvidiaDrawEnable):
* hw/kdrive/r128/r128.c: (r128ScreenInit), (r128Preserve),
(r128DPMS):
* hw/kdrive/r128/r128draw.c: (r128WaitAvail), (r128Setup),
(r128DrawInit):
* hw/kdrive/r128/r128stub.c:
* hw/kdrive/smi/smi.c: (smiRandRSetConfig), (smiPreserve),
(smiDPMS), (smiRestore):
* hw/kdrive/smi/smi.h:
* hw/kdrive/smi/smidraw.c: (smiPrepareSolid), (smiPrepareCopy),
(smiDrawInit):
* hw/kdrive/smi/smistub.c:
* hw/kdrive/src/kaa.c:
* hw/kdrive/src/kcmap.c:
* hw/kdrive/src/kcurscol.c:
* hw/kdrive/src/kdrive.c: (KdCreateScreenResources):
* hw/kdrive/src/kdrive.h:
* hw/kdrive/src/kinput.c:
* hw/kdrive/src/knoop.c:
* hw/kdrive/src/vga.c:
* hw/kdrive/src/vga.h:
* hw/kdrive/vesa/vesa.h:
* hw/xnest/Color.c: (xnestCreateColormap), (xnestDestroyColormap),
(xnestCountInstalledColormapWindows),
(xnestGetInstalledColormapWindows),
(xnestSameInstalledColormapWindows),
(xnestSetInstalledColormapWindows),
(xnestSetScreenSaverColormapWindow), (xnestDirectInstallColormaps),
(xnestDirectUninstallColormaps), (xnestInstallColormap),
(xnestUninstallColormap), (xnestListInstalledColormaps),
(xnestStoreColors), (xnestResolveColor),
(xnestCreateDefaultColormap):
* hw/xnest/Color.h:
* hw/xnest/Cursor.c: (xnestConstrainCursor), (xnestCursorLimits),
(xnestDisplayCursor), (xnestRealizeCursor), (xnestUnrealizeCursor),
(xnestRecolorCursor), (xnestSetCursorPosition):
* hw/xnest/Display.c: (xnestOpenDisplay):
* hw/xnest/Display.h:
* hw/xnest/Events.c: (xnestExposurePredicate),
(xnestNotExposurePredicate), (xnestCollectExposures),
(xnestCollectEvents):
* hw/xnest/Events.h:
* hw/xnest/Font.c: (xnestRealizeFont), (xnestUnrealizeFont):
* hw/xnest/GC.c: (xnestValidateGC), (xnestChangeGC), (xnestCopyGC),
(xnestDestroyGC), (xnestDestroyClipHelper), (xnestChangeClip),
(xnestDestroyClip), (xnestCopyClip), (xnestCreateGC):
* hw/xnest/GCOps.c: (xnestFillSpans), (xnestSetSpans),
(xnestGetSpans), (xnestQueryBestSize), (xnestPutImage),
(xnestGetImage), (xnestBitBlitPredicate), (xnestBitBlitHelper),
(xnestCopyArea), (xnestCopyPlane), (xnestPolyPoint),
(xnestPolylines), (xnestPolySegment), (xnestPolyRectangle),
(xnestPolyArc), (xnestFillPolygon), (xnestPolyFillRect),
(xnestPolyFillArc), (xnestPolyText8), (xnestPolyText16),
(xnestImageText8), (xnestImageText16), (xnestImageGlyphBlt),
(xnestPolyGlyphBlt), (xnestPushPixels):
* hw/xnest/GCOps.h:
* hw/xnest/Keyboard.h:
* hw/xnest/Screen.c: (xnestScreen):
* hw/xnest/Screen.h:
* hw/xnest/Visual.c: (xnestVisual), (xnestVisualFromID):
* hw/xnest/Visual.h:
* hw/xnest/Window.c: (xnestWindowPtr):
* hw/xnest/XNCursor.h:
* hw/xnest/XNFont.h:
* hw/xnest/XNGC.h:
* hw/xnest/XNPixmap.h:
* hw/xnest/XNWindow.h:
* include/extnsionst.h:
* mi/Makefile.am:
* mi/miinitext.c:
* os/Makefile.am:
* os/connection.c: (ClientAuthorized):
* os/hpsocket.c: (set_socket_option), (unset_socket_option):
* os/xdmauth.c: (XdmCheckCookie), (XdmToID):
Prototype fixes (various)
Add GCC warnings (including -Werror. clean up your code)
Other warning fixes (unused variables, etc)
Get rid of unused extension interfaces (aux screen procs)
Make lots of functions in kdrive static
Eliminate unused code from os library
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/mi/Makefile.am,v
retrieving revision 3.5.2.3
retrieving revision 3.5.2.4
diff -u -d -r3.5.2.3 -r3.5.2.4
--- Makefile.am 25 Oct 2003 06:10:48 -0000 3.5.2.3
+++ Makefile.am 29 Oct 2003 16:26:56 -0000 3.5.2.4
@@ -1,4 +1,5 @@
INCLUDES = \
+ -I$(top_srcdir)/Xext \
-I$(top_srcdir)/render \
-I$(top_srcdir)/xfixes \
-I$(top_srcdir)/damageext \
Index: miinitext.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miinitext.c,v
retrieving revision 3.71.2.1
retrieving revision 3.71.2.2
diff -u -d -r3.71.2.1 -r3.71.2.2
--- miinitext.c 24 Oct 2003 06:35:24 -0000 3.71.2.1
+++ miinitext.c 29 Oct 2003 16:26:56 -0000 3.71.2.2
@@ -53,6 +53,7 @@
#include "misc.h"
#include "extension.h"
#include "micmap.h"
+#include "xext.h"
#ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */
#undef PEXEXT
@@ -143,24 +144,12 @@
#ifdef XINPUT
extern void XInputExtensionInit(INITARGS);
#endif
-#ifdef XTEST
-extern void XTestExtensionInit(INITARGS);
-#endif
-#ifdef BIGREQS
-extern void BigReqExtensionInit(INITARGS);
-#endif
-#ifdef MITMISC
-extern void MITMiscExtensionInit(INITARGS);
-#endif
#ifdef XIDLE
extern void XIdleExtensionInit(INITARGS);
#endif
#ifdef XTRAP
extern void DEC_XTRAPInit(INITARGS);
#endif
-#ifdef SCREENSAVER
-extern void ScreenSaverExtensionInit (INITARGS);
-#endif
#ifdef XV
extern void XvExtensionInit(INITARGS);
extern void XvMCExtensionInit(INITARGS);
@@ -168,15 +157,9 @@
#ifdef XIE
extern void XieInit(INITARGS);
#endif
-#ifdef XSYNC
-extern void SyncExtensionInit(INITARGS);
-#endif
#ifdef XKB
extern void XkbExtensionInit(INITARGS);
#endif
-#ifdef XCMISC
-extern void XCMiscExtensionInit(INITARGS);
-#endif
#ifdef XRECORD
extern void RecordExtensionInit(INITARGS);
#endif
@@ -240,9 +223,6 @@
#ifdef XFIXES
#include "xfixes.h"
#endif
-#ifdef RES
-extern void ResExtensionInit(INITARGS);
-#endif
#ifdef DAMAGEEXT
#include "damageext.h"
#endif