summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--glib/dbus-glib-tool.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 71e8f7b6..ab9c2e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
We now copy the message from a DBusError and then free
the error object befor throwing the error
+ * glib/dbus-glib-tool.c: removed extra comma at the end of the
+ DBusBindingOutputMode enum which was causing a warning.
+ #include <time.h> so using time_t is explicitly defined
+
2005-09-26 John (J5) Palmieri <johnp@redhat.com>
* Integrate patches from Lennart Poettering <mzsqb at 0pointer.de>:
diff --git a/glib/dbus-glib-tool.c b/glib/dbus-glib-tool.c
index 53ae42b2..228fbf81 100644
--- a/glib/dbus-glib-tool.c
+++ b/glib/dbus-glib-tool.c
@@ -36,6 +36,7 @@
#include <errno.h>
#include <sys/stat.h>
#include <string.h>
+#include <time.h>
#ifdef DBUS_BUILD_TESTS
static void run_all_tests (const char *test_data_dir);
@@ -45,7 +46,7 @@ typedef enum {
DBUS_BINDING_OUTPUT_NONE,
DBUS_BINDING_OUTPUT_PRETTY,
DBUS_BINDING_OUTPUT_GLIB_SERVER,
- DBUS_BINDING_OUTPUT_GLIB_CLIENT,
+ DBUS_BINDING_OUTPUT_GLIB_CLIENT
} DBusBindingOutputMode;
static void