diff options
| author | David Zeuthen <davidz@redhat.com> | 2010-05-20 10:51:00 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2010-05-20 10:53:08 -0400 |
| commit | 366b3ffcde4f19cabf8685efdc1ccd20dcade0ca (patch) | |
| tree | 765a61bb3345a1766a2a639018cee500b2a165b0 /gio/gdbusauth.c | |
| parent | 152448cb299cd1b22da585dcd7e86ee6e27e1169 (diff) | |
Bug 619142 – Build fixes
- Fix various #include issues
- Change #error to #warning for the EXTERNAL authentication mechanism.
It is not clear if this should work on Win32 at all.
- Call close() before unlink() for the SHA1 keyring
- Change #error to #warning so we don't forget to do
permission checking of the .dbus-keyrings directory
- Use Win32 SID for the SHA1 auth mech
- Apparently we can't use word 'interface' as an identifier
- Implement a _g_dbus_win32_get_user_sid() function. For now it's
private. Don't know if it should be public somewhere. Maybe in
a future GCredentials support for Win32? I don't know.
- GFileDescriptorBased is not available on Win32. So avoid using
it in GLocalFile stuff. Now, Win32 still uses GLocalFile + friends
(which works with file descriptors) so expose a private function
to get the fd for an OutputStream so things still work.
- Fixup gio.symbols
- Fixup tests/gdbus-peer.c so it builds
With this, at least things compile and the gdbus-peer.exe test case
passes. Which is a great start. I've tested this by cross-compiling on
a x86_64 Fedora 13 host using mingw32 and running the code on a 32-bit
Windows 7 box.
https://bugzilla.gnome.org/show_bug.cgi?id=619142
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'gio/gdbusauth.c')
| -rw-r--r-- | gio/gdbusauth.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c index 35f100a6a..eeced636f 100644 --- a/gio/gdbusauth.c +++ b/gio/gdbusauth.c @@ -22,9 +22,6 @@ #include "config.h" -#include <sys/types.h> -#include <sys/socket.h> - #include "gdbusauth.h" #include "gdbusauthmechanismanon.h" @@ -37,8 +34,13 @@ #include "gioenumtypes.h" #include "gcredentials.h" #include "gdbusprivate.h" +#include "giostream.h" +#include "gdatainputstream.h" +#include "gdataoutputstream.h" #ifdef G_OS_UNIX +#include <sys/types.h> +#include <sys/socket.h> #include "gunixconnection.h" #include "gunixcredentialsmessage.h" #endif |