CVS: winex/include winhttp.h, 1.1, 1.2 winnt.h, 1.35, 1.36

[email protected] 31 Jul 2007 18:07:20 -0000
Newsgroups gmane.comp.emulators.winex.cvs
Message-ID <[email protected]>
Subject: winex/include winhttp.h,1.1,1.2 winnt.h,1.35,1.36Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv26423/include

Modified Files:
	winhttp.h winnt.h 
Log Message:

- build fixes for some newer Linux distros


Index: winhttp.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/winhttp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- winhttp.h	31 Jul 2007 18:07:05 -0000	1.1
+++ winhttp.h	31 Jul 2007 18:07:18 -0000	1.2
@@ -138,15 +138,15 @@
 BOOLAPI
 WinHttpTimeFromSystemTime
 (
-    __in CONST SYSTEMTIME *pst,
-    __out_ecount(WINHTTP_TIME_FORMAT_BUFSIZE) LPWSTR pwszTime
+    CONST SYSTEMTIME *pst,
+    LPWSTR pwszTime
 );
 
 BOOLAPI
 WinHttpTimeToSystemTime
 (
-    __in LPCWSTR pwszTime,
-    __out SYSTEMTIME *pst
+    LPCWSTR pwszTime,
+    SYSTEMTIME *pst
 );
 
 
@@ -161,19 +161,19 @@
 BOOLAPI
 WinHttpCrackUrl
 (
-    __in_ecount(dwUrlLength) LPCWSTR pwszUrl,
-    __in DWORD dwUrlLength,
-    __in DWORD dwFlags,
-    __inout LPURL_COMPONENTS lpUrlComponents
+    LPCWSTR pwszUrl,
+    DWORD dwUrlLength,
+    DWORD dwFlags,
+    LPURL_COMPONENTS lpUrlComponents
 );
     
 BOOLAPI
 WinHttpCreateUrl
 (
-    __in LPURL_COMPONENTS lpUrlComponents,
-    __in DWORD dwFlags,
-    __out_ecount_full_opt(*lpdwUrlLength) LPWSTR pwszUrl,
-    __inout LPDWORD lpdwUrlLength
+    LPURL_COMPONENTS lpUrlComponents,
+    DWORD dwFlags,
+    LPWSTR pwszUrl,
+    LPDWORD lpdwUrlLength
 );
 
 #define ICU_ESCAPE      0x80000000
@@ -745,8 +745,8 @@
 BOOLAPI
 WinHttpDetectAutoProxyConfigUrl
 (
-    __in  DWORD     dwAutoDetectFlags,
-    __out LPWSTR *  ppwszAutoConfigUrl
+    DWORD     dwAutoDetectFlags,
+    LPWSTR *  ppwszAutoConfigUrl
 );
 
 BOOLAPI

Index: winnt.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/winnt.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- winnt.h	31 Jul 2007 18:07:05 -0000	1.35
+++ winnt.h	31 Jul 2007 18:07:18 -0000	1.36
@@ -193,13 +193,6 @@
 #define OPTIONAL
 #endif
 
-#define __in
-#define __in_ecount(a)
-#define __out
-#define __out_ecount(a)
-#define __out_ecount_full_opt(a)
-#define __inout
-
 /* Standard data types */
 typedef const void                  *PCVOID,   *LPCVOID;
 typedef int             BOOL,       *PBOOL,    *LPBOOL;