Make libcroco work.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 25108429ffbd8ea5f1227b343356e1397b092940..bf1bc462b75ccfa5de55326e8cc228187fd26f18 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-25  Bruno Haible  <bruno@clisp.org>
+
+       * lib/glibconfig_.h (g_return_if_fail, g_return_val_if_fail,
+       g_return_if_reached, g_return_val_if_reached): Return instead of
+       calling abort().
+
 2006-11-12  Bruno Haible  <bruno@clisp.org>
 
        * modules/libcroco: New file.

diff --git a/gnulib-local/lib/glibconfig_.h b/gnulib-local/lib/glibconfig_.h
index 1e3dd34798ca3aa7ee6c6673eba56913e10abe50..e6673bc99d11e7d53c0c483db7abca5caca588cf 100644 (file)
--- a/gnulib-local/lib/glibconfig_.h
+++ b/gnulib-local/lib/glibconfig_.h
@@ -147,10 +147,10 @@ typedef ssize_t gssize;
 #define g_assert(expr)                 if (!(expr)) abort ()
 #define g_assert_not_reached()         abort ()
 
-#define g_return_if_fail(expr)         if (!(expr)) abort ()
-#define g_return_val_if_fail(expr,val) if (!(expr)) abort ()
-#define g_return_if_reached()          abort ()
-#define g_return_val_if_reached(val)   abort ()
+#define g_return_if_fail(expr)         if (!(expr)) return
+#define g_return_val_if_fail(expr,val) if (!(expr)) return (val)
+#define g_return_if_reached()          return
+#define g_return_val_if_reached(val)   return (val)
 
 #define G_LOG_LEVEL_CRITICAL 0
 #define G_LOG_LEVEL_INFO     0