Merge branch 'my-dbus-1.2'

[platform/upstream/dbus.git] / dbus / dbus-sysdeps-win.h

diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h
index 161a819..c65caa8 100644 (file)
--- a/dbus/dbus-sysdeps-win.h
+++ b/dbus/dbus-sysdeps-win.h
@@ -26,6 +26,7 @@
 #ifndef DBUS_SYSDEPS_WIN_H
 #define DBUS_SYSDEPS_WIN_H
 
+extern void *_dbus_win_get_dll_hmodule (void);
 #define _WINSOCKAPI_
 
 #include "dbus-hash.h"
@@ -49,10 +50,6 @@
 #endif
 #endif
 
-/* Declarations missing in mingw's headers */
-extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR  StringSid, PSID *Sid);
-extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
-
 
 #define DBUS_CONSOLE_DIR "/var/run/console/"
 
@@ -89,43 +86,11 @@ _dbus_win_sid_to_name_and_domain (dbus_uid_t uid,
                                   wchar_t  **wdomain,
                                   DBusError *error);
 
-typedef struct DBusFile DBusFile;
-
-dbus_bool_t _dbus_file_open (DBusFile   *file,
-                             const char *filename,
-                             int         oflag,
-                             int         pmode);
-
-dbus_bool_t _dbus_file_close (DBusFile  *file,
-                              DBusError *error);
-
-
-int _dbus_file_read  (DBusFile   *file,
-                      DBusString *buffer,
-                      int         count);
-
-int _dbus_file_write (DBusFile         *file,
-                      const DBusString *buffer,
-                      int               start,
-                      int               len);
-
 dbus_bool_t _dbus_file_exists (const char *filename);
 
-
-#define FDATA private_data
-struct DBusFile
-  {
-    int FDATA;
-  };
-
-
 dbus_bool_t _dbus_get_config_file_name(DBusString *config_file, 
                                        char *s);
 
-
-
 #endif
 
 /** @} end of sysdeps-win.h */
-
-