xserver: Branch 'master' - 8 commits
Julien Cristau
jcristau at kemper.freedesktop.org
Sun Oct 26 04:49:53 PDT 2008
Xext/geext.c | 3 ++-
Xi/chgdctl.c | 1 -
dix/dixfonts.c | 3 +--
dix/main.c | 1 -
dix/window.c | 2 +-
hw/xfree86/common/xf86DGA.c | 1 +
hw/xfree86/common/xf86Xinput.c | 5 +++++
hw/xfree86/ramdac/xf86Cursor.c | 1 -
hw/xfree86/xaa/Makefile.am | 2 +-
hw/xfree86/xaa/xaaInit.c | 3 +++
hw/xnest/Events.c | 1 -
include/dix-config.h.in | 3 +++
include/os.h | 5 +++++
mi/mibank.c | 12 ------------
mi/micmap.c | 4 ----
os/strlcat.c | 1 +
os/strlcpy.c | 1 +
17 files changed, 24 insertions(+), 25 deletions(-)
New commits:
commit 4b96ba8ddf36f84d4b8c0f2964535bd90477a742
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:56:35 2008 +0100
Nuke unused miBankNewSerialNumber
diff --git a/mi/mibank.c b/mi/mibank.c
index 68415e6..dcaf4a1 100644
--- a/mi/mibank.c
+++ b/mi/mibank.c
@@ -2203,18 +2203,6 @@ miInitializeBanking(
return TRUE;
}
-/* This is used to force GC revalidation when the banking type is changed */
-/*ARGSUSED*/
-static int
-miBankNewSerialNumber(
- WindowPtr pWin,
- pointer unused
-)
-{
- pWin->drawable.serialNumber = NEXT_SERIAL_NUMBER;
- return WT_WALKCHILDREN;
-}
-
/*
* Given various screen attributes, determine the minimum scanline width such
* that each scanline is server and DDX padded and any pixels with imbedded
commit e85d5d707d51d6a1558dfcf0ebd50183b84be39d
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:55:50 2008 +0100
Ansify declaration of FontToXError()
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index a1ecbfb..416adb3 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -98,8 +98,7 @@ static FontPathElementPtr *slept_fpes = (FontPathElementPtr *) 0;
static FontPatternCachePtr patternCache;
static int
-FontToXError(err)
- int err;
+FontToXError(int err)
{
switch (err) {
case Successful:
commit 30a7a06a9e91a91b8517f67897831c1407713e57
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:38:44 2008 +0100
Nuke prototype for nonexistent function
miDoInitVisuals was removed in commit
94825ad3c72a1c3f6a61199c302841f63241cf87, but its prototype was left.
diff --git a/mi/micmap.c b/mi/micmap.c
index 2d43e01..b92ddec 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -48,10 +48,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
_X_EXPORT ColormapPtr miInstalledMaps[MAXSCREENS];
-static Bool miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
- int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
- unsigned long sizes, int bitsPerRGB, int preferredVis);
-
_X_EXPORT int
miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
{
commit 5244690a5e0285b6243ee1f28ae6c8287a32b73d
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:37:11 2008 +0100
Add prototypes for strlcpy/strlcat
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 6c3d91c..954a428 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -72,6 +72,9 @@
/* Support SHM */
#undef HAS_SHM
+/* Have the 'strlcpy' function */
+#undef HAS_STRLCPY
+
/* Define to 1 if you have the <asm/mtrr.h> header file. */
#undef HAVE_ASM_MTRR_H
diff --git a/include/os.h b/include/os.h
index 7acc591..77e9448 100644
--- a/include/os.h
+++ b/include/os.h
@@ -456,6 +456,11 @@ extern int xstrncasecmp(const char *s1, const char *s2, size_t n);
extern char *xstrcasestr(const char *s, const char *find);
#endif
+#ifndef HAS_STRLCPY
+extern size_t strlcpy(char *dst, const char *src, size_t siz);
+extern size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
/* Logging. */
typedef enum _LogParameter {
XLOG_FLUSH,
diff --git a/os/strlcat.c b/os/strlcat.c
index b57fcc5..91ceabb 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -21,6 +21,7 @@
#include <sys/types.h>
#include <string.h>
+#include "os.h"
/*
* Appends src to string dst of size siz (unlike strncat, siz is the
diff --git a/os/strlcpy.c b/os/strlcpy.c
index 989d038..aa9d042 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -20,6 +20,7 @@
#include <sys/types.h>
#include <string.h>
+#include "os.h"
/*
* Copy src to string dst of size siz. At most siz-1 characters
commit eadf90aa65d1ea63ddcd74e60e66a79ad567c7e8
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:20:33 2008 +0100
xaa: Fix compiler warning (implicit declaration)
xaaInit.c: In function 'XAAInit':
xaaInit.c:201: warning: implicit declaration of function 'miInitializeCompositeWrapper'
xaaInit.c:201: warning: nested extern declaration of 'miInitializeCompositeWrapper'
diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
index c409eb7..e9f5e68 100644
--- a/hw/xfree86/xaa/Makefile.am
+++ b/hw/xfree86/xaa/Makefile.am
@@ -69,6 +69,6 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
xaaStipple.c xaaTEGlyph.c xaaNonTEGlyph.c xaaBitmap.c \
XAA.HOWTO
-INCLUDES = $(XORG_INCS)
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../../../miext/cw
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index deb1989..8d3833e 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -19,6 +19,9 @@
#include "xaawrap.h"
#include "xf86fbman.h"
#include "servermd.h"
+#ifdef COMPOSITE
+#include "cw.h"
+#endif
#define MAX_PREALLOC_MEM 65536 /* MUST be >= 1024 */
commit aee514cfb5e5a59b7770699765ccdad8fe42f904
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:16:05 2008 +0100
xfree86: Fix compiler warnings (implicit declarations)
Add missing includes to fix the following warnings:
xf86DGA.c: In function 'DGAProcessKeyboardEvent':
xf86DGA.c:1050: warning: implicit declaration of function 'UpdateDeviceState'
xf86DGA.c:1050: warning: nested extern declaration of 'UpdateDeviceState'
xf86Xinput.c: In function 'xf86ActivateDevice':
xf86Xinput.c:303: warning: implicit declaration of function 'AssignTypeAndName'
xf86Xinput.c:303: warning: nested extern declaration of 'AssignTypeAndName'
xf86Xinput.c:311: warning: implicit declaration of function 'DeviceIsPointerType'
xf86Xinput.c:311: warning: nested extern declaration of 'DeviceIsPointerType'
xf86Xinput.c:324: warning: implicit declaration of function 'XkbSetExtension'
xf86Xinput.c:324: warning: nested extern declaration of 'XkbSetExtension'
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 83a1a65..83bc411 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -47,6 +47,7 @@
#endif
#include "xf86Xinput.h"
#include "exglobals.h"
+#include "exevents.h"
#include "mi.h"
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index d404048..f99bfb7 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -62,6 +62,7 @@
#include "mipointer.h"
#include "xf86InPriv.h"
#include "compiler.h"
+#include "extinit.h"
#ifdef DPMSExtension
#define DPMS_SERVER
@@ -89,6 +90,10 @@
#include "dgaproc.h"
#endif
+#ifdef XKB
+#include "xkbsrv.h"
+#endif
+
#include "os.h"
EventListPtr xf86Events = NULL;
commit add946daed531e29935593fb2e7ee70286185baf
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:14:40 2008 +0100
Nuke unused variables
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index bbec7cc..6044f6c 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -138,7 +138,6 @@ ProcXChangeDeviceControl(ClientPtr client)
CARD32 *resolution;
xDeviceAbsCalibCtl *calib;
xDeviceAbsAreaCtl *area;
- xDeviceCoreCtl *c;
xDeviceEnableCtl *e;
devicePresenceNotify dpn;
diff --git a/dix/main.c b/dix/main.c
index 9a6f2d6..7bd91e0 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -240,7 +240,6 @@ int main(int argc, char *argv[], char *envp[])
#endif
{
int i;
- char *xauthfile;
HWEventQueueType alwaysCheckForInput[2];
display = "0";
diff --git a/dix/window.c b/dix/window.c
index e9aad52..1a28d27 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1014,7 +1014,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
Pixmap pixID;
CursorPtr pCursor, pOldCursor;
Cursor cursorID;
- WindowPtr pChild, pLayerWin;
+ WindowPtr pChild;
Colormap cmap;
ColormapPtr pCmap;
xEvent xE;
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 592eaad..aea1d33 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -460,7 +460,6 @@ xf86DeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
static void
xf86DeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{
- DeviceIntPtr it;
xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
&pScreen->devPrivates, xf86CursorScreenKey);
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 355b46f..35ba432 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -117,7 +117,6 @@ void
xnestCollectEvents(void)
{
XEvent X;
- xEvent x;
int i, n, valuators[2];
ScreenPtr pScreen;
GetEventList(&xnestEvents);
commit f2bda61c03f64133ef68dd1557b26ae7dc5beb0e
Author: Julien Cristau <jcristau at debian.org>
Date: Sun Oct 26 11:05:13 2008 +0100
Xext: Fix compiler warnings
Make GEClientGone static and include registry.h, to fix the following
warnings:
geext.c:225: warning: no previous prototype for 'GEClientGone'
geext.c: In function 'GEExtensionInit':
geext.c:280: warning: implicit declaration of function 'RegisterResourceName'
geext.c:280: warning: nested extern declaration of 'RegisterResourceName'
diff --git a/Xext/geext.c b/Xext/geext.c
index 8de4e7c..a58db03 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -28,6 +28,7 @@
#endif
#include "windowstr.h"
#include <X11/extensions/ge.h>
+#include "registry.h"
#include "geint.h"
#include "geext.h"
@@ -220,7 +221,7 @@ SGEGenericEvent(xEvent* from, xEvent* to)
* Resource callback, invoked when the client disconnects and the associated
* GE masks must be destroyed.
*/
-int
+static int
GEClientGone(WindowPtr pWin, XID id)
{
GenericClientMasksPtr gclmask;
More information about the xorg-commit
mailing list