[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-dbus
Subject:    windows build fix patches
From:       Romain Pokrzywka <romain () kdab ! com>
Date:       2010-03-17 0:40:10
Message-ID: 201003161740.10579.romain () kdab ! com
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


Hi,

Here's a couple of patches for master, to fix the windows build after the recent \
merges. It probably needs to be applied  to dbus-1.2 as well actually.


-- 
Romain Pokrzywka | romain@kdab.com | Certified Qt Software Engineer & Trainer
Klarälvdalens Datakonsult AB, a KDAB Group company
Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322)
KDAB - Qt Experts - Platform-independent software solutions


["0001-apply-the-changes-from-04cf3166002a86b9a22851be4e243.patch" (text/x-patch)]

From 0a63d4c0f778b3d49d30639e745352dd0b5c1372 Mon Sep 17 00:00:00 2001
From: Romain Pokrzywka <romain@kdab.com>
Date: Tue, 16 Mar 2010 16:13:00 -0700
Subject: apply the changes from 04cf3166002a86b9a22851be4e243c87b5b3048d to windows too

---
 dbus/dbus-sysdeps-util-win.c |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
index b9ebc82..2722b01 100644
--- a/dbus/dbus-sysdeps-util-win.c
+++ b/dbus/dbus-sysdeps-util-win.c
@@ -231,27 +231,37 @@ _dbus_init_system_log (void)
 }
 
 /**
- * Log an informative message.  Intended for use primarily by
- * the system bus.
+ * Log a message to the system log file (e.g. syslog on Unix).
  *
+ * @param severity a severity value
  * @param msg a printf-style format string
  * @param args arguments for the format string
+ *
  */
 void
-_dbus_log_info (const char *msg, va_list args)
+_dbus_system_log (DBusSystemLogSeverity severity, const char *msg, ...)
 {
-    // FIXME!
+  va_list args;
+
+  va_start (args, msg);
+
+  _dbus_system_logv (severity, msg, args);
+
+  va_end (args);
 }
 
 /**
- * Log a security-related message.  Intended for use primarily by
- * the system bus.
+ * Log a message to the system log file (e.g. syslog on Unix).
  *
+ * @param severity a severity value
  * @param msg a printf-style format string
  * @param args arguments for the format string
+ *
+ * If the FATAL severity is given, this function will terminate the program
+ * with an error code.
  */
 void
-_dbus_log_security (const char *msg, va_list args)
+_dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args)
 {
     // FIXME!
 }
-- 
1.6.5.1.1367.gcd48


["0002-export-_dbus_credentials_to_string_append-for-the-te.patch" (text/x-patch)]

From 5af3aa9c330e3b5c23f41b8330eaeb1114b991be Mon Sep 17 00:00:00 2001
From: Romain Pokrzywka <romain@kdab.com>
Date: Tue, 16 Mar 2010 16:14:55 -0700
Subject: export _dbus_credentials_to_string_append for the tests

---
 dbus/dbus-1-symbols.def.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dbus/dbus-1-symbols.def.in b/dbus/dbus-1-symbols.def.in
index 7144a2d..669af3a 100644
--- a/dbus/dbus-1-symbols.def.in
+++ b/dbus/dbus-1-symbols.def.in
@@ -95,6 +95,7 @@ _dbus_credentials_new
 _dbus_credentials_new_from_current_process
 _dbus_credentials_ref
 _dbus_credentials_same_user
+_dbus_credentials_to_string_append
 _dbus_credentials_unref
 _dbus_daemon_publish_session_bus_address
 _dbus_daemon_unpublish_session_bus_address
-- 
1.6.5.1.1367.gcd48


["signature.asc" (application/pgp-signature)]

_______________________________________________
dbus mailing list
dbus@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dbus


[prev in list] [next in list] [prev in thread] [next in thread]