Module Name: xsrc
Committed By: martin
Date: Sat Jul 3 09:43:29 UTC 2021
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c
Log Message:
Add missing include of compiler.h and make all declarations of
IOPortBase consistent.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.17 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.18
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.17 Mon May 31 21:44:19 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Sat Jul 3 09:43:29 2021
@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *bas
#define PORT_SIZE short
#endif
-extern unsigned int IOPortBase; /* Memory mapped I/O port area */
+extern unsigned PORT_SIZE IOPortBase; /* Memory mapped I/O port area */
static __inline__ void
outb(unsigned PORT_SIZE port, unsigned char val)
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.14
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13 Fri Jul 2 19:31:47 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c Sat Jul 3 09:43:29 2021
@@ -36,6 +36,7 @@
#include "xf86_OSlib.h"
#include "xf86OSpriv.h"
+#include "compiler.h"
#include "bus/Pci.h"
/***************************************************************************/
