Make checks happy again

Minor syntax changes and improved check regexps.

src/cairo-mutex-impl-private.h

@@ -74,7 +74,7 @@
  *	cairo_mutex_impl_t _cairo_some_mutex;
  *   </programlisting>
  *
- * - #define CAIRO_MUTEX_IMP_<NAME> 1 with suitable name for your platform.  You
+ * - #define %CAIRO_MUTEX_IMP_<NAME> 1 with suitable name for your platform.  You
  *   can later use this symbol in cairo-system.c.
  *
  * - #define CAIRO_MUTEX_IMPL_LOCK(mutex) and CAIRO_MUTEX_IMPL_UNLOCK(mutex) to

src/cairo-os2-surface.c

@@ -233,8 +233,8 @@ void _buffer_free (void *buffer)
 }
 
 /* XXX
- * The cairo_os2_init/fini() functions should be removed and the LibMain
- * code moved to cairo-system.c.  It should also call
+ * The cairo_os2_ini() and cairo_os2_fini() functions should be removed and
+ * the LibMain code moved to cairo-system.c.  It should also call
  * cairo_debug_reset_static_data() instead of duplicating its logic...
  */
 

src/check-preprocessor-syntax.sh

@@ -21,7 +21,7 @@ ALL="/dev/null $HEADERS $PRIVATE $SOURCES"
 echo 'Checking that public header files #include "cairo.h" first (or none)'
 
 for x in $HEADERS; do
-	grep '\<include\>' "$x" /dev/null | head -n 1
+	grep '#.*\<include\>' "$x" /dev/null | head -n 1
 done |
 grep -v '"cairo[.]h"' |
 grep -v 'cairo[.]h:' |
@@ -31,7 +31,7 @@ grep . && stat=1
 echo 'Checking that private header files #include "some cairo header" first (or none)'
 
 for x in $PRIVATE; do
-	grep '\<include\>' "$x" /dev/null | head -n 1
+	grep '#.*\<include\>' "$x" /dev/null | head -n 1
 done |
 grep -v '"cairo.*[.]h"' |
 grep -v 'cairoint[.]h:' |
@@ -41,14 +41,14 @@ grep . && stat=1
 echo 'Checking that source files #include "cairoint.h" first (or none)'
 
 for x in $SOURCES; do
-	grep '\<include\>' "$x" /dev/null | head -n 1
+	grep '#.*\<include\>' "$x" /dev/null | head -n 1
 done |
 grep -v '"cairoint[.]h"' |
 grep . && stat=1
 
 
 echo 'Checking that there is no #include <cairo.*.h>'
-grep '\<include\>.*<.*cairo' $ALL && stat=1
+grep '#.*\<include\>.*<.*cairo' $ALL && stat=1
 
 
 echo 'Checking that feature conditionals are used with #if only (not #ifdef)'