xserver: Branch 'master' - 14 commits
Peter Hutterer
peter.hutterer at who-t.net
Mon May 14 21:20:01 PDT 2012
On Mon, May 14, 2012 at 10:39:24AM -0700, Keith Packard wrote:
> Xi/chgptr.h | 6 ---
> dix/enterleave.h | 8 +---
> dix/events.c | 2 -
> dix/ptrveloc.c | 3 -
> exa/exa.c | 3 -
> hw/kdrive/src/kdrive.h | 3 -
> hw/kdrive/src/kinput.c | 2 -
> hw/xfree86/common/xf86xv.c | 1
> hw/xfree86/common/xf86xvmc.c | 2 -
> hw/xfree86/dixmods/extmod/xvmodproc.h | 4 ++
> include/dixevents.h | 7 ----
> include/input.h | 3 +
> include/resource.h | 3 -
> mi/miinitext.c | 59 ----------------------------------
> miext/shadow/shrotpackYX.h | 3 -
> randr/randrstr.h | 19 ----------
> randr/rrtransform.h | 7 ++++
> xfixes/region.c | 1
> xkb/xkbAccessX.c | 1
> xkb/xkbActions.c | 1
> 20 files changed, 16 insertions(+), 122 deletions(-)
>
> New commits:
> commit 31174565ec0090b4c03c9334c82878be2455f938
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Wed Apr 25 15:03:31 2012 +0200
>
> dix: Remove redundant declarations.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/dix/enterleave.h b/dix/enterleave.h
> index 729059b..c937c0e 100644
> --- a/dix/enterleave.h
> +++ b/dix/enterleave.h
> @@ -60,9 +60,6 @@ extern void LeaveWindow(DeviceIntPtr dev);
> extern void CoreFocusEvent(DeviceIntPtr kbd,
> int type, int mode, int detail, WindowPtr pWin);
>
> -extern void DeviceFocusEvent(DeviceIntPtr kbd,
> - int type, int mode, int detail, WindowPtr pWin);
> -
> extern void SetFocusIn(DeviceIntPtr kbd, WindowPtr win);
>
> extern void SetFocusOut(DeviceIntPtr dev);
This hunk gives me
enterleave.c: In function 'DeviceFocusOutEvents':
enterleave.c:618:9: error: implicit declaration of function
'DeviceFocusEvent' [-Werror=implicit-function-declaration]
enterleave.c:618:9: warning: nested extern declaration of 'DeviceFocusEvent'
[-Wnested-externs]
Cheers,
Peter
> diff --git a/include/dixevents.h b/include/dixevents.h
> index c8f384e..d472969 100644
> --- a/include/dixevents.h
> +++ b/include/dixevents.h
> @@ -77,11 +77,4 @@ extern _X_EXPORT int ProcUngrabButton(ClientPtr /* client */ );
>
> extern _X_EXPORT int ProcRecolorCursor(ClientPtr /* client */ );
>
> -#ifdef PANORAMIX
> -extern _X_EXPORT void PostSyntheticMotion(DeviceIntPtr pDev,
> - int x,
> - int y,
> - int screen, unsigned long time);
> -#endif
> -
> #endif /* DIXEVENTS_H */
> diff --git a/include/input.h b/include/input.h
> index 991d648..bcf98a6 100644
> --- a/include/input.h
> +++ b/include/input.h
> @@ -472,6 +472,9 @@ extern _X_EXPORT int GetProximityEvents(InternalEvent *events,
> extern _X_EXPORT void QueueProximityEvents(DeviceIntPtr pDev,
> int type, const ValuatorMask *mask);
>
> +#ifdef PANORAMIX
> +_X_EXPORT
> +#endif
> extern void PostSyntheticMotion(DeviceIntPtr pDev,
> int x, int y, int screen, unsigned long time);
>
> commit f1cec791d1def506b99b0e6c160e9e8be107bd13
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 20:08:02 2012 +0200
>
> xfree86: Add ifdef wrapper to xvmodproc.h
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h
> index be51e55..0090547 100644
> --- a/hw/xfree86/dixmods/extmod/xvmodproc.h
> +++ b/hw/xfree86/dixmods/extmod/xvmodproc.h
> @@ -3,6 +3,8 @@
> #include <dix-config.h>
> #endif
>
> +#ifndef XVMODPROC_H
> +#define XVMODPROC_H
> #include "xvmcext.h"
>
> extern DevPrivateKey (*XvGetScreenKeyProc) (void);
> @@ -11,3 +13,5 @@ extern int (*XvScreenInitProc) (ScreenPtr);
> extern int (*XvMCScreenInitProc) (ScreenPtr, int, XvMCAdaptorPtr);
>
> extern void XvRegister(void);
> +
> +#endif /* XVMODPROC_H */
> commit d2f71b13946a14d9698d0355cc45b114b236e73b
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:44:48 2012 +0200
>
> Xi: Remove redundant declaration.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/Xi/chgptr.h b/Xi/chgptr.h
> index 47265b3..275511f 100644
> --- a/Xi/chgptr.h
> +++ b/Xi/chgptr.h
> @@ -39,10 +39,4 @@ int ProcXChangePointerDevice(ClientPtr /* client */
> void DeleteFocusClassDeviceStruct(DeviceIntPtr /* dev */
> );
>
> -void SendEventToAllWindows(DeviceIntPtr /* dev */ ,
> - Mask /* mask */ ,
> - xEvent * /* ev */ ,
> - int /* count */
> - );
> -
> #endif /* CHGPTR_H */
> commit a4f87f885a55373a6daf56fd540e10c5f1db5a5c
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:43:31 2012 +0200
>
> kdrive: Remove redundant declarations.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
> index 6c2f293..293798a 100644
> --- a/hw/kdrive/src/kdrive.h
> +++ b/hw/kdrive/src/kdrive.h
> @@ -552,9 +552,6 @@ void
> KdEnableInput(void);
>
> void
> - ProcessInputEvents(void);
> -
> -void
> KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration);
>
> /* kmode.c */
> diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
> index e16fe78..66cdf67 100644
> --- a/hw/kdrive/src/kinput.c
> +++ b/hw/kdrive/src/kinput.c
> @@ -702,8 +702,6 @@ KdKbdCtrl(DeviceIntPtr pDevice, KeybdCtrl * ctrl)
> ki->bellDuration = ctrl->bell_duration;
> }
>
> -extern KeybdCtrl defaultKeyboardControl;
> -
> static int
> KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
> {
> commit 369edd78769fa1a174e4091d0fa0722350df5d68
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:41:07 2012 +0200
>
> dix: don't duplicate DoFocusEvents declaration.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/dix/enterleave.h b/dix/enterleave.h
> index c1729f8..729059b 100644
> --- a/dix/enterleave.h
> +++ b/dix/enterleave.h
> @@ -31,13 +31,12 @@
> #ifndef ENTERLEAVE_H
> #define ENTERLEAVE_H
>
> +#include <dix.h> /* DoFocusEvents() */
> +
> extern void DoEnterLeaveEvents(DeviceIntPtr pDev,
> int sourceid,
> WindowPtr fromWin, WindowPtr toWin, int mode);
>
> -extern void DoFocusEvents(DeviceIntPtr pDev,
> - WindowPtr fromWin, WindowPtr toWin, int mode);
> -
> extern void EnterLeaveEvent(DeviceIntPtr mouse,
> int type,
> int mode, int detail, WindowPtr pWin, Window child);
> commit 36377fb0e88a6d237d98805e802ab3793582c976
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:37:30 2012 +0200
>
> dix: Remove redundant declarations.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/dix/events.c b/dix/events.c
> index 9496b6f..83ae5c9 100644
> --- a/dix/events.c
> +++ b/dix/events.c
> @@ -349,8 +349,6 @@ IsFloating(DeviceIntPtr dev)
> */
> extern int lastEvent;
>
> -extern int DeviceMotionNotify;
> -
> #define CantBeFiltered NoEventMask
> /**
> * Event masks for each event type.
> diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
> index acbb479..a788575 100644
> --- a/dix/ptrveloc.c
> +++ b/dix/ptrveloc.c
> @@ -61,10 +61,7 @@
> ****************************************************************************/
>
> /* fwds */
> -int
> - SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);
> static double
> -
> SimpleSmoothProfile(DeviceIntPtr dev, DeviceVelocityPtr vel, double velocity,
> double threshold, double acc);
> static PointerAccelerationProfileFunc
> commit ea9ed83f8f0da241099d0a11c3460d46c5114dea
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:32:53 2012 +0200
>
> xfree86: don't include xvmodproc.h when not needed
>
> The functions are already declared in xf86xv.h
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
> index 88e2f31..0e5b0cf 100644
> --- a/hw/xfree86/common/xf86xv.c
> +++ b/hw/xfree86/common/xf86xv.c
> @@ -51,7 +51,6 @@
> #include <X11/extensions/Xv.h>
> #include <X11/extensions/Xvproto.h>
> #include "xvdix.h"
> -#include "xvmodproc.h"
>
> #include "xf86xvpriv.h"
>
> diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
> index e584652..7321efa 100644
> --- a/hw/xfree86/common/xf86xvmc.c
> +++ b/hw/xfree86/common/xf86xvmc.c
> @@ -40,8 +40,6 @@
> #include "resource.h"
> #include "dixstruct.h"
>
> -#include "xvmodproc.h"
> -
> #include "xf86xvpriv.h"
> #include "xf86xvmc.h"
>
> commit 1927e5ab25c9c9bf481e75ac50f4b140a96e634a
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:24:19 2012 +0200
>
> xserver: Remove duplicate declaration in resource.h
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/include/resource.h b/include/resource.h
> index 19f46d1..4a8dc31 100644
> --- a/include/resource.h
> +++ b/include/resource.h
> @@ -177,9 +177,6 @@ typedef void (*FindTypeSubResources)(pointer /* value */,
> FindAllRes /* func */,
> pointer /* cdata */);
>
> -extern _X_EXPORT void SetResourceTypeErrorValue(RESTYPE /*type */ ,
> - int /*errorValue */ );
> -
> extern _X_EXPORT SizeType GetResourceTypeSizeFunc(
> RESTYPE /*type*/);
>
> commit 1339681e4fbd4f5981e6246eedb23e8a9c5d10f4
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:19:43 2012 +0200
>
> miext: Remove redundant declaration.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/miext/shadow/shrotpackYX.h b/miext/shadow/shrotpackYX.h
> index 57fcf22..f3df6c5 100644
> --- a/miext/shadow/shrotpackYX.h
> +++ b/miext/shadow/shrotpackYX.h
> @@ -54,9 +54,6 @@
> #endif
>
> void
> - FUNC(ScreenPtr pScreen, shadowBufPtr pBuf);
> -
> -void
> FUNC(ScreenPtr pScreen, shadowBufPtr pBuf)
> {
> RegionPtr damage = shadowDamage(pBuf);
> commit 6699f54fe0b3f4952a75e46fb6c3a643988e65dd
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:18:43 2012 +0200
>
> mi: Remove redundant declarations.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/mi/miinitext.c b/mi/miinitext.c
> index 6ceae05..ca21b6f 100644
> --- a/mi/miinitext.c
> +++ b/mi/miinitext.c
> @@ -93,64 +93,6 @@ SOFTWARE.
> #include "micmap.h"
> #include "globals.h"
>
> -extern Bool noTestExtensions;
> -
> -#ifdef COMPOSITE
> -extern Bool noCompositeExtension;
> -#endif
> -#ifdef DBE
> -extern Bool noDbeExtension;
> -#endif
> -#ifdef DPMSExtension
> -extern Bool noDPMSExtension;
> -#endif
> -#ifdef GLXEXT
> -extern Bool noGlxExtension;
> -#endif
> -#ifdef SCREENSAVER
> -extern Bool noScreenSaverExtension;
> -#endif
> -#ifdef MITSHM
> -extern Bool noMITShmExtension;
> -#endif
> -#ifdef RANDR
> -extern Bool noRRExtension;
> -#endif
> -extern Bool noRenderExtension;
> -
> -#ifdef XCSECURITY
> -extern Bool noSecurityExtension;
> -#endif
> -#ifdef RES
> -extern Bool noResExtension;
> -#endif
> -#ifdef XF86BIGFONT
> -extern Bool noXFree86BigfontExtension;
> -#endif
> -#ifdef XFreeXDGA
> -extern Bool noXFree86DGAExtension;
> -#endif
> -#ifdef XF86DRI
> -extern Bool noXFree86DRIExtension;
> -#endif
> -#ifdef XF86VIDMODE
> -extern Bool noXFree86VidModeExtension;
> -#endif
> -#ifdef XFIXES
> -extern Bool noXFixesExtension;
> -#endif
> -#ifdef PANORAMIX
> -extern Bool noPanoramiXExtension;
> -#endif
> -#ifdef INXQUARTZ
> -extern Bool noPseudoramiXExtension;
> -#endif
> -#ifdef XSELINUX
> -extern Bool noSELinuxExtension;
> -#endif
> -#ifdef XV
> -extern Bool noXvExtension;
> -#endif
> extern Bool noGEExtension;
>
> #ifndef XFree86LOADER
> @@ -265,7 +207,6 @@ extern void DamageExtensionInit(INITARGS);
> #ifdef COMPOSITE
> extern void CompositeExtensionInit(INITARGS);
> #endif
> -extern void GEExtensionInit(INITARGS);
>
> /* The following is only a small first step towards run-time
> * configurable extensions.
> commit b4bf90f9fb20e0e56d2451096d4f62ecfc24a962
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:16:30 2012 +0200
>
> exa: Remove redundant declaration.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/exa/exa.c b/exa/exa.c
> index 754c830..e22f2f0 100644
> --- a/exa/exa.c
> +++ b/exa/exa.c
> @@ -483,9 +483,6 @@ static void
> exaCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
>
> static void
> - exaCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
> -
> -static void
> exaDestroyClip(GCPtr pGC);
>
> const GCFuncs exaGCFuncs = {
> commit 5595e7ce0735db6f82e1fe9df45434826019bf9e
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:15:17 2012 +0200
>
> randr: Remove redundant declaration.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/randr/randrstr.h b/randr/randrstr.h
> index 273885d..1c0e9d4 100644
> --- a/randr/randrstr.h
> +++ b/randr/randrstr.h
> @@ -575,25 +575,6 @@ extern _X_EXPORT void
> RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height);
>
> /*
> - * Compute the complete transformation matrix including
> - * client-specified transform, rotation/reflection values and the crtc
> - * offset.
> - *
> - * Return TRUE if the resulting transform is not a simple translation.
> - */
> -extern _X_EXPORT Bool
> -
> -RRTransformCompute(int x,
> - int y,
> - int width,
> - int height,
> - Rotation rotation,
> - RRTransformPtr rr_transform,
> - PictTransformPtr transform,
> - struct pict_f_transform *f_transform,
> - struct pict_f_transform *f_inverse);
> -
> -/*
> * Return crtc transform
> */
> extern _X_EXPORT RRTransformPtr RRCrtcGetTransform(RRCrtcPtr crtc);
> diff --git a/randr/rrtransform.h b/randr/rrtransform.h
> index efce7e0..2269b4c 100644
> --- a/randr/rrtransform.h
> +++ b/randr/rrtransform.h
> @@ -57,6 +57,13 @@ RRTransformSetFilter(RRTransformPtr dst,
> extern _X_EXPORT Bool
> RRTransformCopy(RRTransformPtr dst, RRTransformPtr src);
>
> +/*
> + * Compute the complete transformation matrix including
> + * client-specified transform, rotation/reflection values and the crtc
> + * offset.
> + *
> + * Return TRUE if the resulting transform is not a simple translation.
> + */
> extern _X_EXPORT Bool
>
> RRTransformCompute(int x,
> commit c59c9dac84301f8eb2a0e4a09a8839146aa5a069
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:13:22 2012 +0200
>
> xkb: Remove redundant declarations.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
> index 111bf9f..95e28e7 100644
> --- a/xkb/xkbAccessX.c
> +++ b/xkb/xkbAccessX.c
> @@ -694,7 +694,6 @@ AccessXFilterReleaseEvent(DeviceEvent *event, DeviceIntPtr keybd)
> /* */
> /************************************************************************/
> extern int xkbDevicePrivateIndex;
> -extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
> void
> ProcessPointerEvent(InternalEvent *ev, DeviceIntPtr mouse)
> {
> diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
> index 5ec1ed5..1adb389 100644
> --- a/xkb/xkbActions.c
> +++ b/xkb/xkbActions.c
> @@ -47,7 +47,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
>
> DevPrivateKeyRec xkbDevicePrivateKeyRec;
>
> -void XkbFakeDeviceButton(DeviceIntPtr dev, Bool press, int button);
> static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags, int x,
> int y);
>
> commit d0a83460451df1a4c5667b2f414c35ee81b4ffa4
> Author: Michal Suchanek <hramrach at gmail.com>
> Date: Tue Apr 24 18:11:16 2012 +0200
>
> xfixes: remove redundant declaration.
>
> Signed-off-by: Michal Suchanek <hramrach at gmail.com>
> Reviewed-by: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
>
> diff --git a/xfixes/region.c b/xfixes/region.c
> index 624109d..0acbada 100644
> --- a/xfixes/region.c
> +++ b/xfixes/region.c
> @@ -27,7 +27,6 @@
> #include "xfixesint.h"
> #include "scrnintstr.h"
> #include <picturestr.h>
> -extern int RenderErrBase;
>
> #include <regionstr.h>
> #include <gcstruct.h>
> _______________________________________________
> xorg-commit mailing list
> xorg-commit at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-commit
>
More information about the xorg-devel
mailing list