Module Name: xsrc
Committed By: christos
Date: Mon May 30 15:31:56 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c wscons.c
wscons.h
Log Message:
make this compile.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.11
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10 Sat May 28 09:24:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c Mon May 30 11:31:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vidc.c,v 1.10 2011/05/28 13:24:04 christos Exp $ */
+/* $NetBSD: vidc.c,v 1.11 2011/05/30 15:31:56 christos Exp $ */
/*
* Copyright (c) 1999 Neil A. Carson & Mark Brinicombe
@@ -50,24 +50,38 @@
#include <unistd.h>
#include <errno.h>
+
/* X11 headers
*/
#include "Xos.h"
#include "X.h"
#include "Xproto.h"
-#include "mi.h"
+#include "Xmd.h"
+#ifndef PSZ
+#define PSZ 8
+#endif
#include "cfb.h"
-#include "screenint.h"
+#undef PSZ
+#include "cfb16.h"
+#include "cfb32.h"
+#include "colormap.h"
+#include "colormapst.h"
+#include "cursor.h"
+#include "dixfontstr.h"
+#include "fontstruct.h"
+#include "gcstruct.h"
#include "input.h"
#include "inputstr.h"
-#include "cursor.h"
+#include "mi.h"
+#include "mifillarc.h"
+#include "mipointer.h"
#include "misc.h"
+#include "mistruct.h"
+#include "pixmapstr.h"
+#include "regionstr.h"
+#include "resource.h"
#include "scrnintstr.h"
#include "servermd.h"
-#include "mipointer.h"
-#include "colormap.h"
-#include "colormapst.h"
-#include "resource.h"
#include "wscons.h"
/* #define DEBUG */
@@ -482,7 +496,7 @@
RegisterPointerDevice(mouse);
RegisterKeyboardDevice(keyboard);
miRegisterPointerDevice(screenInfo.screens[0], mouse);
- if (!mieqInit(keyboard, mouse))
+ if (!mieqInit((DevicePtr)keyboard, (DevicePtr)mouse))
FatalError("mieqInit failed!!\n");
/* Start taking some SIGIOs on input device file descriptors. */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.6
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.5 Thu May 19 21:22:37 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c Mon May 30 11:31:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons.c,v 1.5 2011/05/20 01:22:37 christos Exp $ */
+/* $NetBSD: wscons.c,v 1.6 2011/05/30 15:31:56 christos Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -47,6 +47,7 @@
#include "input.h"
#include "cursor.h"
#include "misc.h"
+#include "mi.h"
#include "scrnintstr.h"
#include "servermd.h"
#include "mipointer.h"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2 Mon May 23 15:58:56 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h Mon May 30 11:31:56 2011
@@ -12,3 +12,5 @@
void wsdisplay_closedown(void);
void wskbd_closedown(void);
+
+int mouse_accel(DeviceIntPtr, int);
