summaryrefslogtreecommitdiff
path: root/src/check-preprocessor-syntax.sh
diff options
context:
space:
mode:
authorVladimir Vukicevic <vladimir@pobox.com>2009-06-14 20:43:05 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2009-06-16 11:03:46 +0100
commit22587f57bd5d1b4440d936cd4655a7e8fcebdf36 (patch)
treef7f4224e598d8a23b1a643016c880b7c91d5ff84 /src/check-preprocessor-syntax.sh
parent7d3881114add18d5934073d0b04755d343ea38c6 (diff)
downloadcairo-22587f57bd5d1b4440d936cd4655a7e8fcebdf36.tar.gz
Import Qt backend by Mozilla
Written by Vladimir Vukicevic to enable integration with Qt embedded devices, this backend allows cairo code to target QPainter, and use it as a source for other cairo backends. This imports the sources from mozilla-central: http://mxr.mozilla.org/mozilla-central/find?text=&kind=text&string=cairo-qpainter renames them from cairo-qpainter to cairo-qt, and integrates the patch by Oleg Romashin: https://bugs.freedesktop.org/attachment.cgi?id=18953 And then attempts to restore 'make check' to full functionality. However: - C++ does not play well with the PLT symbol hiding, and leaks into the global namespace. 'make check' fails at check-plt.sh - Qt embeds a GUI into QApplication which it requires to construct any QPainter drawable, i.e. used by the boilerplate to create a cairo-qt surface, and this leaks fonts (cairo-ft-fonts no less) causing assertion failures that all cairo objects are accounted for upon destruction. [Updated by Chris Wilson] Acked-by: Jeff Muizelaar <jeff@infidigm.net> Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'src/check-preprocessor-syntax.sh')
-rwxr-xr-xsrc/check-preprocessor-syntax.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/check-preprocessor-syntax.sh b/src/check-preprocessor-syntax.sh
index d57354989..4e8efaa33 100755
--- a/src/check-preprocessor-syntax.sh
+++ b/src/check-preprocessor-syntax.sh
@@ -52,6 +52,7 @@ grep '#.*\<include\>.*<.*cairo' $ALL >&2 && stat=1
echo 'Checking that feature conditionals are used with #if only (not #ifdef)'
-grep '#if.*CAIRO_HAS_' $ALL | grep def >&2 && stat=1
+grep '#ifdef CAIRO_HAS_' $ALL && stat=1
+grep '#if.*defined[ ]*(CAIRO_HAS_' $ALL && stat=1
exit $stat