summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--dbus/dbus-internals.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a1c5425..8bb63ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-03 Havoc Pennington <hp@redhat.com>
+
+ * dbus/dbus-internals.h: I'm an idiot, _dbus_assert certainly can
+ return
+
2004-12-26 Havoc Pennington <hp@redhat.com>
* dbus/dbus-internals.h: add _DBUS_GNUC_NORETURN to _dbus_assert
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 28483c91..8560d4ec 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -100,7 +100,7 @@ const char* _dbus_strerror (int error_number);
void _dbus_real_assert (dbus_bool_t condition,
const char *condition_text,
const char *file,
- int line) _DBUS_GNUC_NORETURN;
+ int line);
#define _dbus_assert(condition) \
_dbus_real_assert ((condition) != 0, #condition, __FILE__, __LINE__)
#endif /* !DBUS_DISABLE_ASSERT */