From: Bruno Haible <bruno@clisp.org>
Date: Mon, 27 Nov 2006 12:35:24 +0000 (+0000)
Subject: Make libcroco work.
X-Git-Tag: v0.17~638
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e22473f2d976321cfd4be0af6d2ca644bec70f97;p=thirdparty%2Fgettext.git

Make libcroco work.
---

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 25108429f..bf1bc462b 100644
--- 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 1e3dd3479..e6673bc99 100644
--- 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