Module Name: xsrc
Committed By: christos
Date: Fri May 27 21:32:50 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h
Log Message:
deal with amiga_membarrier being a macro.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.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/amiga/s3/amigaCV.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.2 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h Fri May 27 17:32:49 2011
@@ -296,9 +296,11 @@
#endif
}
-static __inline void amiga_membarrier() {
+#ifndef amiga_membarrier
+static __inline void amiga_membarrier(void) {
abort();
}
+#endif
/* don't forget to init vgaBase and inf before using these macros! */