Module Name: xsrc
Committed By: mrg
Date: Tue Nov 23 07:08:06 UTC 2010
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
Log Message:
fix a merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
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.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.5 Tue Nov 23 06:38:03 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Tue Nov 23 07:08:05 2010
@@ -799,7 +799,7 @@
{
return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
}
-#enif
+#endif
static __inline__ unsigned int
inl(unsigned PORT_SIZE port)
