Fix warnings on Windows builds.

diff --git a/bus/dir-watch-default.c b/bus/dir-watch-default.c
index 8e457eb6bcf6f4a7acea0af82f3e2e710a42aa7a..69361b1fb92faeb16c2f45c67453ffce6d2249d5 100644 (file)
--- a/bus/dir-watch-default.c
+++ b/bus/dir-watch-default.c
@@ -29,11 +29,6 @@
 
 /* NoOp */
 
-void
-bus_watch_directory (const char *dir, BusContext *context)
-{
-}
-
 void
 bus_set_watched_dirs (BusContext *context, DBusList **directories)
 {

diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c
index d1a81e26988d27bda169ee865f244c9f79586d44..932b459c2e2e41fdb4d2777b924c4fffa58c5f09 100644 (file)
--- a/dbus/dbus-file-win.c
+++ b/dbus/dbus-file-win.c
@@ -133,7 +133,7 @@ _dbus_file_get_contents (DBusString       *str,
       return FALSE;
     }
 
-  _dbus_verbose ("file %s fd 0x%x opened\n", filename_c, hnd);
+  _dbus_verbose ("file %s hnd %p opened\n", filename_c, hnd);
   
   fsize = GetFileSize (hnd, &fsize_hi);
   if (fsize == 0xFFFFFFFF && GetLastError() != NO_ERROR)
@@ -274,7 +274,7 @@ _dbus_string_save_to_file (const DBusString *str,
       goto out;
     }
 
-  _dbus_verbose ("tmp file %s fd 0x%x opened\n", tmp_filename_c, hnd);
+  _dbus_verbose ("tmp file %s hnd %p opened\n", tmp_filename_c, hnd);
 
   need_unlink = TRUE;
 
@@ -383,7 +383,7 @@ _dbus_create_file_exclusively (const DBusString *filename,
       return FALSE;
     }
 
-  _dbus_verbose ("exclusive file %s fd 0x%x opened\n", filename_c, hnd);
+  _dbus_verbose ("exclusive file %s hnd %p opened\n", filename_c, hnd);
 
   if (CloseHandle (hnd) == 0)
     {

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index d0b208192f109ba9296b6ece0dfbd0103d500d6a..bcb9c824f7ec64fc2d4498c18fbd8e33abded863 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2487,7 +2487,7 @@ _dbus_daemon_publish_session_bus_address (const char* address)
   hDBusDaemonMutex = CreateMutexA( NULL, FALSE, cDBusDaemonMutex );
   ret = WaitForSingleObject( hDBusDaemonMutex, 1000 );
   if ( ret != WAIT_OBJECT_0 ) {
-    _dbus_warn("Could not lock mutex %s (return code %d). daemon already running? Bus address not published.\n", cDBusDaemonMutex, ret );
+    _dbus_warn("Could not lock mutex %s (return code %ld). daemon already running? Bus address not published.\n", cDBusDaemonMutex, ret );
     return;
   }