Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4

[platform/upstream/dbus.git] / dbus / dbus-sysdeps-wince-glue.h

diff --git a/dbus/dbus-sysdeps-wince-glue.h b/dbus/dbus-sysdeps-wince-glue.h
index 47f13da..f5ac6c8 100644 (file)
--- a/dbus/dbus-sysdeps-wince-glue.h
+++ b/dbus/dbus-sysdeps-wince-glue.h
@@ -28,6 +28,7 @@
 #include <time.h>
 #include <stdarg.h>
 
+/* For getaddrinfo, configure/cmake defined _WIN32_WCE to something >= 0x0401.  */
 #include <windows.h>
 #undef interface
 
@@ -46,7 +47,7 @@ BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPWSTR,int,BOOL);
 
 /* Seriously.  Windows CE does not have errno.  Don't you hate it when
    that happens?  */
-#define errno (GetLastError ())
+#define errno ((int)GetLastError ())
 
 #define ENOENT          ERROR_FILE_NOT_FOUND
 #define EMFILE          ERROR_TOO_MANY_OPEN_FILES
@@ -105,10 +106,19 @@ void abort (void);
 #define _S_IREAD        0000400         /* read permission, owner */
 #define _S_IWRITE       0000200         /* write permission, owner */
 #define _S_IEXEC        0000100         /* execute/search permission, owner */
+
 #ifndef __OFF_T_DEFINED
 typedef long off_t;
 #define __OFF_T_DEFINED
 #endif
+#ifndef _INTPTR_T_DEFINED
+typedef int intptr_t;
+#define _INTPTR_T_DEFINED
+#endif
+#ifndef _UINTPTR_T_DEFINED
+typedef unsigned int uintptr_t;
+#define _UINTPTR_T_DEFINED
+#endif
 
 #ifndef _MAX_FNAME
 #define _MAX_FNAME 256
@@ -227,6 +237,10 @@ DWORD GetTempPathA(DWORD,LPSTR);
 BOOL SHGetSpecialFolderPathA(HWND,LPSTR,int,BOOL);
 
 
+#define OutputDebugStringA _dbus_wince_OutputDebugStringA
+void OutputDebugStringA(LPCSTR);
+
+
 DBUS_END_DECLS
 
 #endif /* DBUS_SYSDEPS_WINCE_GLUE_H */