diff -r b79d47dad1ea gfx/cairo/cairo/src/cairoint.h
--- a/cairo/src/cairoint.h	Fri Jun 08 18:09:53 2007 -0700
+++ b/cairo/src/cairoint.h	Fri Jun 29 09:18:02 2007 +0200
@@ -159,6 +159,13 @@ CAIRO_BEGIN_DECLS
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
+#endif
+
+#ifndef NDEBUG
+#undef assert
+#define assert(expr) \
+    do { if (!(expr)) fprintf(stderr, "Assertion failed at %s:%d: %s\n", \
+          __FILE__, __LINE__, #expr); } while (0)
 #endif
 
 #undef  ARRAY_LENGTH