Module Name: xsrc
Committed By: mrg
Date: Mon Mar 17 20:01:53 UTC 2014
Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-glyph.c
Log Message:
avoid using __force_align_arg_pointer__ on non-x86, where it does not exist.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/pixman/dist/pixman/pixman-glyph.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/pixman/dist/pixman/pixman-glyph.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c:1.1.1.3 xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c:1.2
--- xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c:1.1.1.3 Mon Mar 17 01:18:22 2014
+++ xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c Mon Mar 17 20:01:53 2014
@@ -391,7 +391,7 @@ box32_intersect (pixman_box32_t *dest,
return dest->x2 > dest->x1 && dest->y2 > dest->y1;
}
-#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
+#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && defined(__i386__)
__attribute__((__force_align_arg_pointer__))
#endif
PIXMAN_EXPORT void
@@ -633,7 +633,7 @@ out:
* - Trim the mask to the destination clip/image?
* - Trim composite region based on sources, when the op ignores 0s.
*/
-#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
+#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && defined(__i386__)
__attribute__((__force_align_arg_pointer__))
#endif
PIXMAN_EXPORT void
