xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Tue Jun 5 10:33:44 PDT 2012
hw/xfree86/common/xf86xvpriv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3cbaf621782fb5f5679acf9104571d3ae2b48b72
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Jun 5 17:54:02 2012 +0100
xfree86: fix new warnings introduced in rebase.
Spotted these in tinderbox:
xf86xv.c: In function 'xf86XVScreenInit':
xf86xv.c:282: warning: assignment from incompatible pointer type
xf86xv.c: In function 'xf86XVCloseScreen':
xf86xv.c:1275: warning: assignment from incompatible pointer type
xf86xv.c: In function 'xf86XVAdjustFrame':
xf86xv.c:1366: warning: assignment from incompatible pointer type
Missed removing one flags.
Signed-off-by: Dave Airlie <airlied at redhat.com>
Tested-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h
index 9bedd90..e95f959 100644
--- a/hw/xfree86/common/xf86xvpriv.h
+++ b/hw/xfree86/common/xf86xvpriv.h
@@ -41,7 +41,7 @@ typedef struct {
ClipNotifyProcPtr ClipNotify;
WindowExposuresProcPtr WindowExposures;
PostValidateTreeProcPtr PostValidateTree;
- void (*AdjustFrame) (ScrnInfoPtr, int, int, int);
+ void (*AdjustFrame) (ScrnInfoPtr, int, int);
Bool (*EnterVT) (ScrnInfoPtr);
void (*LeaveVT) (ScrnInfoPtr);
xf86ModeSetProc *ModeSet;
More information about the xorg-commit
mailing list