From: John (J5) Palmieri <johnp@redhat.com>
Date: Mon, 26 Sep 2005 22:26:38 +0000 (+0000)
Subject: * glib/dbus-glib-tool.c: removed extra comma at the end of the
X-Git-Tag: dbus-0.60~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68d1880e5650e5ae5fa41457a7628c2e02838a3f;p=thirdparty%2Fdbus.git

* 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
---

diff --git a/ChangeLog b/ChangeLog
index 71e8f7b6f..ab9c2e591 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 53ae42b27..228fbf818 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