From 378053ba594cca44e1bc9e069eab91b0a0954308 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 1 Jun 2007 22:05:42 +0000 Subject: * bus/main.c (main): uses _dbus_get_config_file_name() to detect session.conf location on win32. * dbus-sysdeps-win.h (_dbus_get_config_file_name,_dbus_file_exists): new prototyp, undefined interface after including windows.h because t makes trouble when a paramater is named interface. * dbus-sysdeps-win.c (_dbus_get_install_root,_dbus_get_config_file_name,_dbus_file_exists): new functions. --- dbus/dbus-sysdeps-win.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dbus/dbus-sysdeps-win.h') diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h index 300c3285..29d5b0df 100644 --- a/dbus/dbus-sysdeps-win.h +++ b/dbus/dbus-sysdeps-win.h @@ -33,6 +33,7 @@ #include #include #include +#undef interface #include #include @@ -140,6 +141,9 @@ int _dbus_file_write (DBusFile *file, int start, int len); +dbus_bool_t _dbus_file_exists (const char *filename); + + #define FDATA private_data struct DBusFile { @@ -167,6 +171,9 @@ int _dbus_listen_unix_socket (const char *path, dbus_bool_t abstract, DBusError *error); +dbus_bool_t _dbus_get_config_file_name(DBusString *config_file, + char *s); + #endif /** @} end of sysdeps-win.h */ -- cgit