Module Name: xsrc
Committed By: tsutsui
Date: Wed May 18 21:51:04 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k: x68k.h x68kConfig.c
x68kGraph.c x68kInit.c x68kIo.c x68kKbd.c x68kMouse.c x68kText.c
Log Message:
Dumb fixes to build with -std=gnu99.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c
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/x68k/x68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.1.1.1 Wed Jan 7 12:51:46 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.1.1.1 2004/01/07 12:51:46 minoura Exp $ */
+/* $NetBSD: x68k.h,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -131,4 +131,18 @@
((s)->devPrivates[x68kScreenIndex].ptr))
#define SetupScreen(s) X68kScreenRec *pPriv = GetScreenPrivate(s)
+/* x68kFB.c */
+Bool x68kFbCommonOpen(X68kScreenRec *, char *);
+void x68kFbCommonClose(X68kScreenRec *);
+
+/* x68kText.c */
+Bool x68kTextOpen(X68kScreenRec *fb);
+Bool x68kTextInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
+void x68kTextClose(X68kScreenRec *fb);
+
+/* x68kGraph.c */
+Bool x68kGraphOpen(X68kScreenRec *fb);
+Bool x68kGraphInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
+void x68kGraphClose(X68kScreenRec *fb);
+
/* EOF x68k.h */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.1.1.1 Wed Jan 7 12:51:45 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kIo.c,v 1.1.1.1 2004/01/07 12:51:45 minoura Exp $ */
+/* $NetBSD: x68kIo.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -74,6 +74,7 @@
********************************************************/
#include "x68k.h"
+#include <mi/mi.h>
static void x68kEnqueueEvents();
extern Firm_event* x68kMouseGetEvents( int fd, int *pNumEvents, Bool *pAgain );
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.1.1.1 Wed Jan 7 12:51:44 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.1.1.1 2004/01/07 12:51:44 minoura Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -82,6 +82,7 @@
*/
#include "x68k.h"
+#include <mi/mi.h>
static Bool x68kCursorOffScreen();
static void x68kCrossScreen();
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.1.1.1 Wed Jan 7 12:51:45 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kText.c,v 1.1.1.1 2004/01/07 12:51:45 minoura Exp $ */
+/* $NetBSD: x68kText.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -30,6 +30,7 @@
*-----------------------------------------------------------------------*/
#include "x68k.h"
+#include <mfb.h>
/* in x68kConfig.c */
X68kScreenRec *x68kGetScreenRecByType(int type);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c:1.2 Thu Aug 3 20:16:39 2006
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.2 2006/08/03 20:16:39 mhitch Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.3 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -171,7 +171,7 @@
static Token *getToken(void)
{
int c;
- static line = 1;
+ static int line = 1;
Token *ret;
ret = (Token *)xalloc(sizeof(Token));
@@ -507,15 +507,6 @@
enum TokenType argtype[]= { TOKEN_SYMBOL };
Mode *mode;
- /* in x68kText.c */
- Bool x68kTextOpen(X68kScreenRec *fb);
- Bool x68kTextInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
- void x68kTextClose(X68kScreenRec *fb);
- /* in x68kGraph.c */
- Bool x68kGraphOpen(X68kScreenRec *fb);
- Bool x68kGraphInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
- void x68kGraphClose(X68kScreenRec *fb);
-
checkArguments(1, argtype, argc-1, argv);
/* search mode to set from mode list */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.2 Wed Jan 7 12:55:00 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.2 2004/01/07 12:55:00 minoura Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.3 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -118,6 +118,7 @@
/* cfb */
#define PSZ 16
#include "cfb.h"
+#include <mi/mi.h>
/* in x68kConfig.c */
X68kScreenRec *x68kGetScreenRecByType(int type);
@@ -343,8 +344,7 @@
oldDevPrivate = pScreen->devPrivate;
if (!miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
rootdepth, ndepths, depths,
- defaultVisual, nvisuals, visuals,
- (VisualPtr) 0))
+ defaultVisual, nvisuals, visuals))
return FALSE;
pScreen->CloseScreen = cfb16CloseScreen;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.2 Wed Jan 7 12:55:00 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.2 2004/01/07 12:55:00 minoura Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.3 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -71,6 +71,7 @@
********************************************************/
#include "x68k.h"
+#include <mi/mi.h>
#ifdef XKB
#include <X11/extensions/XKB.h>
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.4 Mon Mar 28 13:04:06 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.4 2005/03/28 13:04:06 minoura Exp $ */
+/* $NetBSD: x68kInit.c,v 1.5 2011/05/18 21:51:04 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -75,6 +75,7 @@
#include "Xos.h"
#include "x68k.h"
+#include <mi/mi.h>
static int nscreens;
@@ -164,7 +165,7 @@
RegisterPointerDevice(p);
RegisterKeyboardDevice(k);
miRegisterPointerDevice(screenInfo.screens[0], p);
- if ( !mieqInit(k, p) )
+ if ( !mieqInit((DevicePtr)k, (DevicePtr)p) )
FatalError("mieqInit failed\n");
/* setup SIGIO handler for asynchronous event handling */
