Module Name: xsrc
Committed By: msaitoh
Date: Thu Dec 25 05:05:28 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/include [netbsd-6]: config.h
Log Message:
Pullup additional patches requested by mrg in ticket #1178:
external/mit/xorg/include/xcb-proto/Makefile patch
external/mit/xorg/lib/fontconfig/src/Makefile patch
external/mit/xorg/server/xorg-server/Makefile patch
xsrc/external/mit/fontconfig/include/config.h patch
- Fix compile error on non x86 archs.
- Fix unexpanded @@ in .pc files.
To generate a diff of this commit:
cvs rdiff -u -r1.5.4.2 -r1.5.4.3 \
xsrc/external/mit/fontconfig/include/config.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/fontconfig/include/config.h
diff -u xsrc/external/mit/fontconfig/include/config.h:1.5.4.2 xsrc/external/mit/fontconfig/include/config.h:1.5.4.3
--- xsrc/external/mit/fontconfig/include/config.h:1.5.4.2 Sun Dec 21 19:13:33 2014
+++ xsrc/external/mit/fontconfig/include/config.h Thu Dec 25 05:05:28 2014
@@ -85,10 +85,10 @@
/* Define to 1 if you have the `getprogname' function. */
#define HAVE_GETPROGNAME 1
-//#if 0 // fontconfig 2.10, but we should have this in -current now
+#if 0 // This is in the Makefile
/* Have Intel __sync_* atomic primitives */
#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
-//#endif
+#endif
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
