1*cdf0e10cSrcweir--- include/crtdbg.h.orig 2006-09-18 01:21:38.968750000 +0900 2*cdf0e10cSrcweir+++ include/crtdbg.h 2006-09-02 23:12:50.109375000 +0900 3*cdf0e10cSrcweir@@ -0,0 +1,11 @@ 4*cdf0e10cSrcweir+#ifndef _CRTDBG_H 5*cdf0e10cSrcweir+#define _CRTDBG_H 6*cdf0e10cSrcweir+#if __GNUC__ >=3 7*cdf0e10cSrcweir+#pragma GCC system_header 8*cdf0e10cSrcweir+#endif 9*cdf0e10cSrcweir+ 10*cdf0e10cSrcweir+#ifndef _ASSERTE 11*cdf0e10cSrcweir+#define _ASSERTE(expr) ((void)0) 12*cdf0e10cSrcweir+#endif 13*cdf0e10cSrcweir+ 14*cdf0e10cSrcweir+#endif 15*cdf0e10cSrcweir--- include/excpt.h.orig 2009-01-11 04:32:43.000000000 +0900 16*cdf0e10cSrcweir+++ include/excpt.h 2009-08-21 09:21:56.000000000 +0900 17*cdf0e10cSrcweir@@ -16,8 +16,11 @@ 18*cdf0e10cSrcweir 19*cdf0e10cSrcweir /* All the headers include this file. */ 20*cdf0e10cSrcweir #include <_mingw.h> 21*cdf0e10cSrcweir+#include <setjmp.h> 22*cdf0e10cSrcweir+#include <stdarg.h> 23*cdf0e10cSrcweir 24*cdf0e10cSrcweir #include <windef.h> 25*cdf0e10cSrcweir+#include <winbase.h> 26*cdf0e10cSrcweir 27*cdf0e10cSrcweir /* 28*cdf0e10cSrcweir * NOTE: The constants structs and typedefs below should be defined in the 29*cdf0e10cSrcweir@@ -52,7 +55,7 @@ 30*cdf0e10cSrcweir * The type of function that is expected as an exception handler to be 31*cdf0e10cSrcweir * installed with __try1. 32*cdf0e10cSrcweir */ 33*cdf0e10cSrcweir-typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER) 34*cdf0e10cSrcweir+typedef EXCEPTION_DISPOSITION (* PEXCEPTION_HANDLER) 35*cdf0e10cSrcweir (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); 36*cdf0e10cSrcweir 37*cdf0e10cSrcweir /* 38*cdf0e10cSrcweir@@ -93,8 +96,122 @@ 39*cdf0e10cSrcweir __asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \ 40*cdf0e10cSrcweir : : : "%eax"); 41*cdf0e10cSrcweir 42*cdf0e10cSrcweir+WINBASEAPI 43*cdf0e10cSrcweir+VOID 44*cdf0e10cSrcweir+WINAPI 45*cdf0e10cSrcweir+RtlUnwind ( 46*cdf0e10cSrcweir+ IN PVOID TargetFrame OPTIONAL, 47*cdf0e10cSrcweir+ IN PVOID TargetIp OPTIONAL, 48*cdf0e10cSrcweir+ IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, 49*cdf0e10cSrcweir+ IN PVOID ReturnValue 50*cdf0e10cSrcweir+ ); 51*cdf0e10cSrcweir #ifdef __cplusplus 52*cdf0e10cSrcweir } 53*cdf0e10cSrcweir+ 54*cdf0e10cSrcweir+class __SEHandler 55*cdf0e10cSrcweir+{ 56*cdf0e10cSrcweir+ public: 57*cdf0e10cSrcweir+ __SEHandler() {} 58*cdf0e10cSrcweir+ ~__SEHandler() {} 59*cdf0e10cSrcweir+ typedef int (*PF)(void *, LPEXCEPTION_POINTERS); 60*cdf0e10cSrcweir+ typedef void (*PH)(void *, LPEXCEPTION_POINTERS); 61*cdf0e10cSrcweir+ typedef void (*PN)(void *); 62*cdf0e10cSrcweir+ void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL) 63*cdf0e10cSrcweir+ { 64*cdf0e10cSrcweir+ __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf)); 65*cdf0e10cSrcweir+ m_pData=pdata; 66*cdf0e10cSrcweir+ switch (reinterpret_cast<int>(pfilter)) 67*cdf0e10cSrcweir+ { 68*cdf0e10cSrcweir+ default: 69*cdf0e10cSrcweir+ m_filter=pfilter; 70*cdf0e10cSrcweir+ break; 71*cdf0e10cSrcweir+ case EXCEPTION_CONTINUE_EXECUTION: 72*cdf0e10cSrcweir+ m_filter=DefaultFilterContinueExecution; 73*cdf0e10cSrcweir+ break; 74*cdf0e10cSrcweir+ case EXCEPTION_EXECUTE_HANDLER: 75*cdf0e10cSrcweir+ m_filter=DefaultFilterExecuteHandler; 76*cdf0e10cSrcweir+ break; 77*cdf0e10cSrcweir+ case EXCEPTION_CONTINUE_SEARCH: 78*cdf0e10cSrcweir+ m_filter=DefaultFilterContinueSearch; 79*cdf0e10cSrcweir+ break; 80*cdf0e10cSrcweir+ } 81*cdf0e10cSrcweir+ if (phandlerbody) 82*cdf0e10cSrcweir+ m_handlerbody=phandlerbody; 83*cdf0e10cSrcweir+ else 84*cdf0e10cSrcweir+ m_handlerbody=DefaultHandler; 85*cdf0e10cSrcweir+ if (pfinal) 86*cdf0e10cSrcweir+ m_final=pfinal; 87*cdf0e10cSrcweir+ else 88*cdf0e10cSrcweir+ m_final=DefaultFinal; 89*cdf0e10cSrcweir+ m_ER.pHandlerClass = this; 90*cdf0e10cSrcweir+ m_ER.hp = handler; 91*cdf0e10cSrcweir+ asm("movl %%fs:0, %%eax\n\t" 92*cdf0e10cSrcweir+ "movl %%eax, %0": : "m" (m_ER.prev): "%eax" ); 93*cdf0e10cSrcweir+ asm("movl %0, %%eax\n\t" 94*cdf0e10cSrcweir+ "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" ); 95*cdf0e10cSrcweir+ } 96*cdf0e10cSrcweir+ void Reset() 97*cdf0e10cSrcweir+ { 98*cdf0e10cSrcweir+ m_final(m_pData); 99*cdf0e10cSrcweir+ asm("movl %0, %%eax \n\t" 100*cdf0e10cSrcweir+ "movl %%eax, %%fs:0" 101*cdf0e10cSrcweir+ : : "m" (m_ER.prev): "%eax"); 102*cdf0e10cSrcweir+ } 103*cdf0e10cSrcweir+ private: 104*cdf0e10cSrcweir+ __SEHandler(const __SEHandler&); 105*cdf0e10cSrcweir+ __SEHandler& operator=(const __SEHandler&); 106*cdf0e10cSrcweir+ struct _ER { 107*cdf0e10cSrcweir+ _ER* prev; 108*cdf0e10cSrcweir+ PEXCEPTION_HANDLER hp; 109*cdf0e10cSrcweir+ __SEHandler *pHandlerClass; 110*cdf0e10cSrcweir+ }; 111*cdf0e10cSrcweir+ static EXCEPTION_DISPOSITION handler( 112*cdf0e10cSrcweir+ struct _EXCEPTION_RECORD *pExceptionRecord, 113*cdf0e10cSrcweir+ void * EstablisherFrame, 114*cdf0e10cSrcweir+ struct _CONTEXT *ContextRecord, 115*cdf0e10cSrcweir+ void * /*DispatcherContext*/) 116*cdf0e10cSrcweir+ { 117*cdf0e10cSrcweir+ __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass; 118*cdf0e10cSrcweir+ if ( pExceptionRecord->ExceptionFlags & EH_UNWINDING ) 119*cdf0e10cSrcweir+ { 120*cdf0e10cSrcweir+ pThis->m_final(pThis->m_pData); 121*cdf0e10cSrcweir+ return ExceptionContinueSearch; 122*cdf0e10cSrcweir+ } 123*cdf0e10cSrcweir+ EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord}; 124*cdf0e10cSrcweir+ switch ( pThis->m_filter(pThis->m_pData, &ep) ) 125*cdf0e10cSrcweir+ { 126*cdf0e10cSrcweir+ case EXCEPTION_EXECUTE_HANDLER: 127*cdf0e10cSrcweir+ RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0); 128*cdf0e10cSrcweir+__set_label: 129*cdf0e10cSrcweir+ pThis->m_handlerbody(pThis->m_pData, &ep); 130*cdf0e10cSrcweir+ ContextRecord->Ebp = pThis->m_jmpbuf[0]; 131*cdf0e10cSrcweir+ ContextRecord->Eip = pThis->m_jmpbuf[1]; 132*cdf0e10cSrcweir+ ContextRecord->Esp = pThis->m_jmpbuf[2]; 133*cdf0e10cSrcweir+ return ExceptionContinueExecution; 134*cdf0e10cSrcweir+ case EXCEPTION_CONTINUE_SEARCH: 135*cdf0e10cSrcweir+ return ExceptionContinueSearch; 136*cdf0e10cSrcweir+ case EXCEPTION_CONTINUE_EXECUTION: 137*cdf0e10cSrcweir+ return ExceptionContinueExecution; 138*cdf0e10cSrcweir+ } 139*cdf0e10cSrcweir+ return ExceptionContinueExecution; 140*cdf0e10cSrcweir+ } 141*cdf0e10cSrcweir+ static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; } 142*cdf0e10cSrcweir+ static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; } 143*cdf0e10cSrcweir+ static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; } 144*cdf0e10cSrcweir+ static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {} 145*cdf0e10cSrcweir+ static void DefaultFinal(void *) {} 146*cdf0e10cSrcweir+ typedef int (*handler_p)( 147*cdf0e10cSrcweir+ struct _EXCEPTION_RECORD *ExceptionRecord, 148*cdf0e10cSrcweir+ void * EstablisherFrame, 149*cdf0e10cSrcweir+ struct _CONTEXT *ContextRecord, 150*cdf0e10cSrcweir+ void * DispatcherContext); 151*cdf0e10cSrcweir+ _ER m_ER; 152*cdf0e10cSrcweir+ void *m_pData; 153*cdf0e10cSrcweir+ PN m_final; 154*cdf0e10cSrcweir+ PH m_handlerbody; 155*cdf0e10cSrcweir+ PF m_filter; 156*cdf0e10cSrcweir+ jmp_buf m_jmpbuf; 157*cdf0e10cSrcweir+}; 158*cdf0e10cSrcweir #endif 159*cdf0e10cSrcweir 160*cdf0e10cSrcweir #endif /* Not RC_INVOKED */ 161*cdf0e10cSrcweir--- include/tchar.h.orig 2009-01-11 04:32:46.000000000 +0900 162*cdf0e10cSrcweir+++ include/tchar.h 2009-08-21 09:21:56.000000000 +0900 163*cdf0e10cSrcweir@@ -223,6 +223,9 @@ 164*cdf0e10cSrcweir #define _ttelldir _wtelldir 165*cdf0e10cSrcweir #define _tseekdir _wseekdir 166*cdf0e10cSrcweir 167*cdf0e10cSrcweir+#define _ttempnam _wtempnam 168*cdf0e10cSrcweir+ 169*cdf0e10cSrcweir+ 170*cdf0e10cSrcweir #else /* Not _UNICODE */ 171*cdf0e10cSrcweir 172*cdf0e10cSrcweir /* 173*cdf0e10cSrcweir@@ -407,6 +410,8 @@ 174*cdf0e10cSrcweir #define _ttelldir telldir 175*cdf0e10cSrcweir #define _tseekdir seekdir 176*cdf0e10cSrcweir 177*cdf0e10cSrcweir+#define _ttempnam _tempnam 178*cdf0e10cSrcweir+ 179*cdf0e10cSrcweir #endif /* Not _UNICODE */ 180*cdf0e10cSrcweir 181*cdf0e10cSrcweir /* 182*cdf0e10cSrcweir--- include/amvideo.h.orig 2008-12-06 11:31:53.000000000 +0900 183*cdf0e10cSrcweir+++ include/amvideo.h 2009-08-21 09:21:56.000000000 +0900 184*cdf0e10cSrcweir@@ -52,10 +52,10 @@ 185*cdf0e10cSrcweir BITMAPINFOHEADER bmiHeader; 186*cdf0e10cSrcweir } VIDEOINFOHEADER; 187*cdf0e10cSrcweir typedef struct tagVIDEOINFO { 188*cdf0e10cSrcweir- RECT rcSource, 189*cdf0e10cSrcweir- RECT rcTarget, 190*cdf0e10cSrcweir- DWORD dwBitRate, 191*cdf0e10cSrcweir- DWORD dwBitErrorRate, 192*cdf0e10cSrcweir+ RECT rcSource; 193*cdf0e10cSrcweir+ RECT rcTarget; 194*cdf0e10cSrcweir+ DWORD dwBitRate; 195*cdf0e10cSrcweir+ DWORD dwBitErrorRate; 196*cdf0e10cSrcweir REFERENCE_TIME AvgTimePerFrame; 197*cdf0e10cSrcweir BITMAPINFOHEADER bmiHeader; 198*cdf0e10cSrcweir union { 199*cdf0e10cSrcweir--- include/basetyps.h.orig 2008-12-06 11:31:53.000000000 +0900 200*cdf0e10cSrcweir+++ include/basetyps.h 2009-08-21 09:21:56.000000000 +0900 201*cdf0e10cSrcweir@@ -80,6 +80,8 @@ 202*cdf0e10cSrcweir CONST_VTABLE struct i##Vtbl 203*cdf0e10cSrcweir # define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i) 204*cdf0e10cSrcweir # endif 205*cdf0e10cSrcweir+# define DECLARE_INTERFACE_IID(i,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE(i) 206*cdf0e10cSrcweir+# define DECLARE_INTERFACE_IID_(i,b,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE_(i,b) 207*cdf0e10cSrcweir # define BEGIN_INTERFACE 208*cdf0e10cSrcweir # define END_INTERFACE 209*cdf0e10cSrcweir 210*cdf0e10cSrcweir--- include/objidl.h.orig 2008-12-06 11:32:04.000000000 +0900 211*cdf0e10cSrcweir+++ include/objidl.h 2009-08-21 09:21:56.000000000 +0900 212*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 213*cdf0e10cSrcweir+#include <windows.h> 214*cdf0e10cSrcweir+#include <ole2.h> 215*cdf0e10cSrcweir+ 216*cdf0e10cSrcweir #ifndef _OBJIDL_H 217*cdf0e10cSrcweir #define _OBJIDL_H 218*cdf0e10cSrcweir #if __GNUC__ >= 3 219*cdf0e10cSrcweir@@ -880,8 +883,8 @@ 220*cdf0e10cSrcweir STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; 221*cdf0e10cSrcweir STDMETHOD_(ULONG,AddRef)(THIS) PURE; 222*cdf0e10cSrcweir STDMETHOD_(ULONG,Release)(THIS) PURE; 223*cdf0e10cSrcweir- STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE; 224*cdf0e10cSrcweir- STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE; 225*cdf0e10cSrcweir+ STDMETHOD_(DWORD,AddConnection)(THIS_ DWORD,DWORD) PURE; 226*cdf0e10cSrcweir+ STDMETHOD_(DWORD,ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE; 227*cdf0e10cSrcweir }; 228*cdf0e10cSrcweir #undef INTERFACE 229*cdf0e10cSrcweir 230*cdf0e10cSrcweir--- include/specstrings.h.orig 2008-12-06 11:32:09.000000000 +0900 231*cdf0e10cSrcweir+++ include/specstrings.h 2009-08-21 09:21:56.000000000 +0900 232*cdf0e10cSrcweir@@ -11,8 +11,31 @@ 233*cdf0e10cSrcweir /* __in and __out currently conflict with libstdc++, use with caution */ 234*cdf0e10cSrcweir 235*cdf0e10cSrcweir 236*cdf0e10cSrcweir+#define __RPC__deref_inout_opt 237*cdf0e10cSrcweir+#define __RPC__deref_opt_inout_ecount_full_opt(size) 238*cdf0e10cSrcweir+#define __RPC__deref_opt_inout_opt 239*cdf0e10cSrcweir+#define __RPC__deref_out 240*cdf0e10cSrcweir+#define __RPC__deref_out_ecount_full_opt(size) 241*cdf0e10cSrcweir+#define __RPC__deref_out_opt 242*cdf0e10cSrcweir+#define __RPC__deref_out_opt_string 243*cdf0e10cSrcweir+#define __RPC__in 244*cdf0e10cSrcweir+#define __RPC__in_ecount_full(size) 245*cdf0e10cSrcweir+#define __RPC__in_ecount_full_opt(size) 246*cdf0e10cSrcweir+#define __RPC__in_opt 247*cdf0e10cSrcweir+#define __RPC__inout 248*cdf0e10cSrcweir+#define __RPC__inout_ecount_full(size) 249*cdf0e10cSrcweir+#define __RPC__inout_ecount_full_opt(size) 250*cdf0e10cSrcweir+#define __RPC__inout_opt 251*cdf0e10cSrcweir+#define __RPC__out 252*cdf0e10cSrcweir+#define __RPC__out_ecount_full(size) 253*cdf0e10cSrcweir+#define __RPC__out_ecount_full_string(size) 254*cdf0e10cSrcweir+#define __RPC__out_ecount_part(size,init) 255*cdf0e10cSrcweir+#define __RPC_unique_pointer 256*cdf0e10cSrcweir #define __bcount(size) 257*cdf0e10cSrcweir #define __bcount_opt(size) 258*cdf0e10cSrcweir+#define __callback 259*cdf0e10cSrcweir+#define __checkReturn 260*cdf0e10cSrcweir+#define __deref 261*cdf0e10cSrcweir #define __deref_bcount(size) 262*cdf0e10cSrcweir #define __deref_bcount_opt(size) 263*cdf0e10cSrcweir #define __deref_ecount(size) 264*cdf0e10cSrcweir@@ -36,6 +59,7 @@ 265*cdf0e10cSrcweir #define __deref_inout_ecount_opt(size) 266*cdf0e10cSrcweir #define __deref_inout_ecount_part(size,length) 267*cdf0e10cSrcweir #define __deref_inout_ecount_part_opt(size,length) 268*cdf0e10cSrcweir+#define __deref_inout_ecount_z(size) 269*cdf0e10cSrcweir #define __deref_inout_opt 270*cdf0e10cSrcweir #define __deref_opt_bcount(size) 271*cdf0e10cSrcweir #define __deref_opt_bcount_opt(size) 272*cdf0e10cSrcweir@@ -89,14 +113,23 @@ 273*cdf0e10cSrcweir #define __deref_out_ecount_part(size,length) 274*cdf0e10cSrcweir #define __deref_out_ecount_part_opt(size,length) 275*cdf0e10cSrcweir #define __deref_out_opt 276*cdf0e10cSrcweir+#define __deref_out_z 277*cdf0e10cSrcweir+#define __deref_out_z_opt 278*cdf0e10cSrcweir #define __ecount(size) 279*cdf0e10cSrcweir #define __ecount_opt(size) 280*cdf0e10cSrcweir+#define __field_bcount(size) 281*cdf0e10cSrcweir+#define __field_ecount(size) 282*cdf0e10cSrcweir+#define __field_ecount_opt(size) 283*cdf0e10cSrcweir+#define __format_string 284*cdf0e10cSrcweir+#define __gdi_entry 285*cdf0e10cSrcweir #define __in 286*cdf0e10cSrcweir #define __in_bcount(size) 287*cdf0e10cSrcweir #define __in_bcount_opt(size) 288*cdf0e10cSrcweir #define __in_ecount(size) 289*cdf0e10cSrcweir #define __in_ecount_opt(size) 290*cdf0e10cSrcweir #define __in_opt 291*cdf0e10cSrcweir+#define __in_xcount(size) 292*cdf0e10cSrcweir+#define __in_z_opt 293*cdf0e10cSrcweir #define __inout 294*cdf0e10cSrcweir #define __inout_bcount(size) 295*cdf0e10cSrcweir #define __inout_bcount_full(size) 296*cdf0e10cSrcweir@@ -111,7 +144,12 @@ 297*cdf0e10cSrcweir #define __inout_ecount_part(size,length) 298*cdf0e10cSrcweir #define __inout_ecount_part_opt(size,length) 299*cdf0e10cSrcweir #define __inout_opt 300*cdf0e10cSrcweir+#define __inout_xcount(size) 301*cdf0e10cSrcweir+#define __notnull 302*cdf0e10cSrcweir+#define __nullnullterminated 303*cdf0e10cSrcweir+#define __nullterminated 304*cdf0e10cSrcweir #define __out 305*cdf0e10cSrcweir+#define __out_awcount(expr,size) 306*cdf0e10cSrcweir #define __out_bcount(size) 307*cdf0e10cSrcweir #define __out_bcount_full(size) 308*cdf0e10cSrcweir #define __out_bcount_full_opt(size) 309*cdf0e10cSrcweir@@ -119,12 +157,20 @@ 310*cdf0e10cSrcweir #define __out_bcount_part(size,length) 311*cdf0e10cSrcweir #define __out_bcount_part_opt(size,length) 312*cdf0e10cSrcweir #define __out_ecount(size) 313*cdf0e10cSrcweir+#define __out_ecount(size) 314*cdf0e10cSrcweir #define __out_ecount_full(size) 315*cdf0e10cSrcweir #define __out_ecount_full_opt(size) 316*cdf0e10cSrcweir #define __out_ecount_opt(size) 317*cdf0e10cSrcweir #define __out_ecount_part(size,length) 318*cdf0e10cSrcweir #define __out_ecount_part_opt(size,length) 319*cdf0e10cSrcweir #define __out_opt 320*cdf0e10cSrcweir+#define __out_xcount(size) 321*cdf0e10cSrcweir+#define __out_xcount_opt(size) 322*cdf0e10cSrcweir+#define __reserved 323*cdf0e10cSrcweir+#define __struct_bcount(size) 324*cdf0e10cSrcweir+#define __success(expr) 325*cdf0e10cSrcweir+#define __typefix(ctype) 326*cdf0e10cSrcweir+#define __unaligned 327*cdf0e10cSrcweir 328*cdf0e10cSrcweir 329*cdf0e10cSrcweir #endif /*_SPECSTRINGS_H */ 330*cdf0e10cSrcweir--- include/uxtheme.h.orig 2008-12-06 11:32:11.000000000 +0900 331*cdf0e10cSrcweir+++ include/uxtheme.h 2010-01-22 14:50:56.327000000 +0900 332*cdf0e10cSrcweir@@ -10,7 +10,7 @@ 333*cdf0e10cSrcweir extern "C" { 334*cdf0e10cSrcweir #endif 335*cdf0e10cSrcweir 336*cdf0e10cSrcweir-#if (_WIN32_WINNT >= 0x0501) 337*cdf0e10cSrcweir+#if (_WIN32_WINNT >= 0x0500) 338*cdf0e10cSrcweir #define DTBG_CLIPRECT 0x00000001 339*cdf0e10cSrcweir #define DTBG_DRAWSOLID 0x00000002 340*cdf0e10cSrcweir #define DTBG_OMITBORDER 0x00000004 341*cdf0e10cSrcweir@@ -35,6 +35,7 @@ 342*cdf0e10cSrcweir #define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM) 343*cdf0e10cSrcweir #define HTTB_SIZINGTEMPLATE 0x0100 344*cdf0e10cSrcweir #define HTTB_SYSTEMSIZINGMARGINS 0x0200 345*cdf0e10cSrcweir+#if 0 346*cdf0e10cSrcweir #define TMT_DISPLAYNAME 0x0259 347*cdf0e10cSrcweir #define TMT_TOOLTIP 0x025A 348*cdf0e10cSrcweir #define TMT_COMPANY 0x025B 349*cdf0e10cSrcweir@@ -186,6 +187,7 @@ 350*cdf0e10cSrcweir #define BT_IMAGEFILE 0x0000 351*cdf0e10cSrcweir #define BT_BORDERFILL 0x0001 352*cdf0e10cSrcweir #define BT_NONE 0x0002 353*cdf0e10cSrcweir+#endif 354*cdf0e10cSrcweir 355*cdf0e10cSrcweir typedef enum PROPERTYORIGIN { 356*cdf0e10cSrcweir PO_STATE = 0, 357*cdf0e10cSrcweir--- include/winbase.h.orig 2008-12-06 11:32:11.000000000 +0900 358*cdf0e10cSrcweir+++ include/winbase.h 2009-08-21 09:21:56.000000000 +0900 359*cdf0e10cSrcweir@@ -1354,8 +1354,8 @@ 360*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD); 361*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI FindFirstFreeAce(PACL,PVOID*); 362*cdf0e10cSrcweir #if (_WIN32_WINNT >= 0x0500) 363*cdf0e10cSrcweir-WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD); 364*cdf0e10cSrcweir-WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD); 365*cdf0e10cSrcweir+WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPSTR,DWORD); 366*cdf0e10cSrcweir+WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPWSTR,DWORD); 367*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD); 368*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD); 369*cdf0e10cSrcweir #endif 370*cdf0e10cSrcweir@@ -1363,7 +1363,7 @@ 371*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA); 372*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW); 373*cdf0e10cSrcweir #if (_WIN32_WINNT >= 0x0500) 374*cdf0e10cSrcweir-WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD); 375*cdf0e10cSrcweir+WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPSTR,DWORD); 376*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD); 377*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD); 378*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD); 379*cdf0e10cSrcweir@@ -1475,10 +1475,10 @@ 380*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetLogicalDrives(void); 381*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR); 382*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR); 383*cdf0e10cSrcweir-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) 384*cdf0e10cSrcweir+//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) 385*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD); 386*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD); 387*cdf0e10cSrcweir-#endif 388*cdf0e10cSrcweir+//#endif 389*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI GetMailslotInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD); 390*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD); 391*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD); 392*cdf0e10cSrcweir@@ -1519,9 +1519,9 @@ 393*cdf0e10cSrcweir #endif 394*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI GetProcessHeap(VOID); 395*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE); 396*cdf0e10cSrcweir-#if (_WIN32_WINNT >= 0x0501) 397*cdf0e10cSrcweir+//#if (_WIN32_WINNT >= 0x0501) 398*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI GetProcessId(HANDLE); 399*cdf0e10cSrcweir-#endif 400*cdf0e10cSrcweir+//#endif 401*cdf0e10cSrcweir #if (_WIN32_WINNT >= 0x0500) 402*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS); 403*cdf0e10cSrcweir #endif 404*cdf0e10cSrcweir@@ -1802,9 +1802,9 @@ 405*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE); 406*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR); 407*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR); 408*cdf0e10cSrcweir-#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490) 409*cdf0e10cSrcweir+//#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490) 410*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI OpenThread(DWORD,BOOL,DWORD); 411*cdf0e10cSrcweir-#endif 412*cdf0e10cSrcweir+//#endif 413*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE); 414*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR); 415*cdf0e10cSrcweir WINBASEAPI HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR); 416*cdf0e10cSrcweir@@ -2029,6 +2029,7 @@ 417*cdf0e10cSrcweir WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); 418*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); 419*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); 420*cdf0e10cSrcweir+WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); 421*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI WinLoadTrustProvider(GUID*); 422*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED); 423*cdf0e10cSrcweir WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); 424*cdf0e10cSrcweir@@ -2151,9 +2152,9 @@ 425*cdf0e10cSrcweir #define GetFileAttributesEx GetFileAttributesExW 426*cdf0e10cSrcweir #define GetFullPathName GetFullPathNameW 427*cdf0e10cSrcweir #define GetLogicalDriveStrings GetLogicalDriveStringsW 428*cdf0e10cSrcweir-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) 429*cdf0e10cSrcweir+//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) 430*cdf0e10cSrcweir #define GetLongPathName GetLongPathNameW 431*cdf0e10cSrcweir-#endif 432*cdf0e10cSrcweir+//#endif 433*cdf0e10cSrcweir #define GetModuleFileName GetModuleFileNameW 434*cdf0e10cSrcweir #define GetModuleHandle GetModuleHandleW 435*cdf0e10cSrcweir #if (_WIN32_WINNT >= 0x0500) 436*cdf0e10cSrcweir@@ -2346,9 +2347,9 @@ 437*cdf0e10cSrcweir #define GetFileAttributesEx GetFileAttributesExA 438*cdf0e10cSrcweir #define GetFullPathName GetFullPathNameA 439*cdf0e10cSrcweir #define GetLogicalDriveStrings GetLogicalDriveStringsA 440*cdf0e10cSrcweir-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) 441*cdf0e10cSrcweir+//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) 442*cdf0e10cSrcweir #define GetLongPathName GetLongPathNameA 443*cdf0e10cSrcweir-#endif 444*cdf0e10cSrcweir+//#endif 445*cdf0e10cSrcweir #define GetNamedPipeHandleState GetNamedPipeHandleStateA 446*cdf0e10cSrcweir #define GetModuleHandle GetModuleHandleA 447*cdf0e10cSrcweir #if (_WIN32_WINNT >= 0x0500) 448*cdf0e10cSrcweir--- include/windef.h.orig 2008-12-06 11:32:12.000000000 +0900 449*cdf0e10cSrcweir+++ include/windef.h 2009-08-21 09:21:56.000000000 +0900 450*cdf0e10cSrcweir@@ -251,6 +251,7 @@ 451*cdf0e10cSrcweir typedef unsigned int UINT,*PUINT,*LPUINT; 452*cdf0e10cSrcweir 453*cdf0e10cSrcweir #include <winnt.h> 454*cdf0e10cSrcweir+#include <specstrings.h> 455*cdf0e10cSrcweir 456*cdf0e10cSrcweir typedef UINT_PTR WPARAM; 457*cdf0e10cSrcweir typedef LONG_PTR LPARAM; 458*cdf0e10cSrcweir--- include/wininet.h.orig 2008-12-06 11:32:13.000000000 +0900 459*cdf0e10cSrcweir+++ include/wininet.h 2009-08-21 09:21:56.000000000 +0900 460*cdf0e10cSrcweir@@ -868,6 +868,7 @@ 461*cdf0e10cSrcweir BOOL WINAPI InternetAutodial(DWORD,DWORD); 462*cdf0e10cSrcweir BOOL WINAPI InternetAutodialHangup(DWORD); 463*cdf0e10cSrcweir BOOL WINAPI InternetGetConnectedState(LPDWORD,DWORD); 464*cdf0e10cSrcweir+BOOL WINAPI InternetGetConnectedStateEx(LPDWORD,LPTSTR,DWORD,DWORD); 465*cdf0e10cSrcweir BOOL WINAPI InternetSetDialState(LPCTSTR,DWORD,DWORD); 466*cdf0e10cSrcweir BOOL WINAPI InternetReadFileExA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD_PTR); 467*cdf0e10cSrcweir BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR); 468*cdf0e10cSrcweir--- include/winver.h.orig 2008-12-06 11:32:14.000000000 +0900 469*cdf0e10cSrcweir+++ include/winver.h 2009-08-21 09:21:56.000000000 +0900 470*cdf0e10cSrcweir@@ -101,10 +101,10 @@ 471*cdf0e10cSrcweir DWORD WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT); 472*cdf0e10cSrcweir DWORD WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT); 473*cdf0e10cSrcweir DWORD WINAPI VerInstallFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT); 474*cdf0e10cSrcweir-DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,PDWORD); 475*cdf0e10cSrcweir-DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,PDWORD); 476*cdf0e10cSrcweir-BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID); 477*cdf0e10cSrcweir-BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID); 478*cdf0e10cSrcweir+DWORD WINAPI GetFileVersionInfoSizeA(LPSTR,PDWORD); 479*cdf0e10cSrcweir+DWORD WINAPI GetFileVersionInfoSizeW(LPWSTR,PDWORD); 480*cdf0e10cSrcweir+BOOL WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,PVOID); 481*cdf0e10cSrcweir+BOOL WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,PVOID); 482*cdf0e10cSrcweir DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); 483*cdf0e10cSrcweir DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); 484*cdf0e10cSrcweir BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT); 485*cdf0e10cSrcweir--- include/wtypes.h.orig 2008-12-06 11:32:14.000000000 +0900 486*cdf0e10cSrcweir+++ include/wtypes.h 2009-08-21 09:21:56.000000000 +0900 487*cdf0e10cSrcweir@@ -66,6 +66,19 @@ 488*cdf0e10cSrcweir unsigned short asData[1]; 489*cdf0e10cSrcweir }FLAGGED_WORD_BLOB; 490*cdf0e10cSrcweir 491*cdf0e10cSrcweir+typedef struct _COAUTHIDENTITY 492*cdf0e10cSrcweir+ { 493*cdf0e10cSrcweir+ /* [size_is] */ USHORT *User; 494*cdf0e10cSrcweir+ /* [range] */ ULONG UserLength; 495*cdf0e10cSrcweir+ /* [size_is] */ USHORT *Domain; 496*cdf0e10cSrcweir+ /* [range] */ ULONG DomainLength; 497*cdf0e10cSrcweir+ /* [size_is] */ USHORT *Password; 498*cdf0e10cSrcweir+ /* [range] */ ULONG PasswordLength; 499*cdf0e10cSrcweir+ ULONG Flags; 500*cdf0e10cSrcweir+ } COAUTHIDENTITY; 501*cdf0e10cSrcweir+ 502*cdf0e10cSrcweir+typedef WORD CLIPFORMAT,*LPCLIPFORMAT; 503*cdf0e10cSrcweir+ 504*cdf0e10cSrcweir #ifndef OLE2ANSI 505*cdf0e10cSrcweir typedef WCHAR OLECHAR; 506*cdf0e10cSrcweir typedef LPWSTR LPOLESTR; 507*cdf0e10cSrcweir@@ -94,6 +107,7 @@ 508*cdf0e10cSrcweir }_STRUCT_NAME(s); 509*cdf0e10cSrcweir LONGLONG int64; 510*cdf0e10cSrcweir } CY; 511*cdf0e10cSrcweir+typedef union tagCY *LPCY; 512*cdf0e10cSrcweir typedef double DATE; 513*cdf0e10cSrcweir typedef struct tagBSTRBLOB { 514*cdf0e10cSrcweir ULONG cbSize; 515*cdf0e10cSrcweir@@ -165,6 +179,52 @@ 516*cdf0e10cSrcweir #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;} 517*cdf0e10cSrcweir #endif 518*cdf0e10cSrcweir typedef void *HMETAFILEPICT; 519*cdf0e10cSrcweir+ 520*cdf0e10cSrcweir+typedef enum tagTYSPEC { 521*cdf0e10cSrcweir+ TYSPEC_CLSID, 522*cdf0e10cSrcweir+ TYSPEC_FILEEXT, 523*cdf0e10cSrcweir+ TYSPEC_MIMETYPE, 524*cdf0e10cSrcweir+ TYSPEC_FILENAME, 525*cdf0e10cSrcweir+ TYSPEC_PROGID, 526*cdf0e10cSrcweir+ TYSPEC_PACKAGENAME, 527*cdf0e10cSrcweir+ TYSPEC_OBJECTID 528*cdf0e10cSrcweir+} TYSPEC; 529*cdf0e10cSrcweir+ 530*cdf0e10cSrcweir+typedef union { 531*cdf0e10cSrcweir+ CLSID clsid; 532*cdf0e10cSrcweir+ LPOLESTR pFileExt; 533*cdf0e10cSrcweir+ LPOLESTR pMimeType; 534*cdf0e10cSrcweir+ LPOLESTR pProgId; 535*cdf0e10cSrcweir+ LPOLESTR pFileName; 536*cdf0e10cSrcweir+ struct { 537*cdf0e10cSrcweir+ LPOLESTR pPackageName; 538*cdf0e10cSrcweir+ GUID PolicyId; 539*cdf0e10cSrcweir+ } ByName; 540*cdf0e10cSrcweir+ struct { 541*cdf0e10cSrcweir+ GUID ObjectId; 542*cdf0e10cSrcweir+ GUID PolicyId; 543*cdf0e10cSrcweir+ } ByObjectId; 544*cdf0e10cSrcweir+} uCLSSPEC; 545*cdf0e10cSrcweir+ 546*cdf0e10cSrcweir+typedef struct tagCSPLATFORM { 547*cdf0e10cSrcweir+ DWORD dwContext; 548*cdf0e10cSrcweir+ DWORD dwVersionHi; 549*cdf0e10cSrcweir+ DWORD dwVersionLo; 550*cdf0e10cSrcweir+ DWORD dwProcessorArch; 551*cdf0e10cSrcweir+} CSPLATFORM; 552*cdf0e10cSrcweir+ 553*cdf0e10cSrcweir+typedef struct tagQUERYCONTEXT { 554*cdf0e10cSrcweir+ DWORD dwContext; 555*cdf0e10cSrcweir+ CSPLATFORM Platform; 556*cdf0e10cSrcweir+ LCID Locale; 557*cdf0e10cSrcweir+ DWORD dwVersionHi; 558*cdf0e10cSrcweir+ DWORD dwVersionLo; 559*cdf0e10cSrcweir+} QUERYCONTEXT; 560*cdf0e10cSrcweir+typedef struct 561*cdf0e10cSrcweir+{ 562*cdf0e10cSrcweir+ GUID fmtid; 563*cdf0e10cSrcweir+ DWORD pid; 564*cdf0e10cSrcweir+} PROPERTYKEY; 565*cdf0e10cSrcweir #ifdef __cplusplus 566*cdf0e10cSrcweir } 567*cdf0e10cSrcweir #endif 568*cdf0e10cSrcweir--- include/adoctint.h.orig 2008-01-18 22:17:10.000000000 +0900 569*cdf0e10cSrcweir+++ include/adoctint.h 2009-08-21 09:21:56.000000000 +0900 570*cdf0e10cSrcweir@@ -11,6 +11,9 @@ 571*cdf0e10cSrcweir //-------------------------------------------------------------------- 572*cdf0e10cSrcweir #ifndef _ADOCTINT_H_ 573*cdf0e10cSrcweir #define _ADOCTINT_H_ 574*cdf0e10cSrcweir+#if __GNUC__ >=3 575*cdf0e10cSrcweir+#pragma GCC system_header 576*cdf0e10cSrcweir+#endif 577*cdf0e10cSrcweir 578*cdf0e10cSrcweir #ifndef _INC_TCHAR 579*cdf0e10cSrcweir #include <tchar.h> 580*cdf0e10cSrcweir@@ -2489,11 +2492,11 @@ 581*cdf0e10cSrcweir #endif /* __Procedure_INTERFACE_DEFINED__ */ 582*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Catalog; 583*cdf0e10cSrcweir #ifdef __cplusplus 584*cdf0e10cSrcweir-Catalog; 585*cdf0e10cSrcweir+//Catalog; 586*cdf0e10cSrcweir #endif 587*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Table; 588*cdf0e10cSrcweir #ifdef __cplusplus 589*cdf0e10cSrcweir-Table; 590*cdf0e10cSrcweir+//Table; 591*cdf0e10cSrcweir #endif 592*cdf0e10cSrcweir #ifndef __Property_INTERFACE_DEFINED__ 593*cdf0e10cSrcweir #define __Property_INTERFACE_DEFINED__ 594*cdf0e10cSrcweir@@ -2635,23 +2638,23 @@ 595*cdf0e10cSrcweir #endif /* __Property_INTERFACE_DEFINED__ */ 596*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Group; 597*cdf0e10cSrcweir #ifdef __cplusplus 598*cdf0e10cSrcweir-Group; 599*cdf0e10cSrcweir+//Group; 600*cdf0e10cSrcweir #endif 601*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_User; 602*cdf0e10cSrcweir #ifdef __cplusplus 603*cdf0e10cSrcweir-User; 604*cdf0e10cSrcweir+//User; 605*cdf0e10cSrcweir #endif 606*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Column; 607*cdf0e10cSrcweir #ifdef __cplusplus 608*cdf0e10cSrcweir-Column; 609*cdf0e10cSrcweir+//Column; 610*cdf0e10cSrcweir #endif 611*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Index; 612*cdf0e10cSrcweir #ifdef __cplusplus 613*cdf0e10cSrcweir-Index; 614*cdf0e10cSrcweir+//Index; 615*cdf0e10cSrcweir #endif 616*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Key; 617*cdf0e10cSrcweir #ifdef __cplusplus 618*cdf0e10cSrcweir-Key; 619*cdf0e10cSrcweir+//Key; 620*cdf0e10cSrcweir #endif 621*cdf0e10cSrcweir #ifndef __Tables_INTERFACE_DEFINED__ 622*cdf0e10cSrcweir #define __Tables_INTERFACE_DEFINED__ 623*cdf0e10cSrcweir@@ -3332,8 +3335,8 @@ 624*cdf0e10cSrcweir /* [in] */ VARIANT Item, 625*cdf0e10cSrcweir /* [defaultvalue][in] */ KeyTypeEnum Type, 626*cdf0e10cSrcweir /* [optional][in] */ VARIANT Column, 627*cdf0e10cSrcweir- /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = L"", 628*cdf0e10cSrcweir- /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = L"") = 0; 629*cdf0e10cSrcweir+ /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = const_cast<BSTR>(L""), 630*cdf0e10cSrcweir+ /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = const_cast<BSTR>(L"")) = 0; 631*cdf0e10cSrcweir 632*cdf0e10cSrcweir virtual /* [helpcontext] */ HRESULT STDMETHODCALLTYPE Delete( 633*cdf0e10cSrcweir /* [in] */ VARIANT Item) = 0; 634*cdf0e10cSrcweir--- include/adodef.h.orig 2008-01-18 22:17:10.000000000 +0900 635*cdf0e10cSrcweir+++ include/adodef.h 2009-08-21 09:21:56.000000000 +0900 636*cdf0e10cSrcweir@@ -12,6 +12,9 @@ 637*cdf0e10cSrcweir 638*cdf0e10cSrcweir #ifndef _ADODEF_H_ 639*cdf0e10cSrcweir #define _ADODEF_H_ 640*cdf0e10cSrcweir+#if __GNUC__ >=3 641*cdf0e10cSrcweir+#pragma GCC system_header 642*cdf0e10cSrcweir+#endif 643*cdf0e10cSrcweir 644*cdf0e10cSrcweir // TYPELIB MAJOR VERSIONS 645*cdf0e10cSrcweir #define ADO_MAJOR 6 646*cdf0e10cSrcweir--- include/adoguids.h.orig 2008-01-18 22:17:10.000000000 +0900 647*cdf0e10cSrcweir+++ include/adoguids.h 2009-08-21 09:21:56.000000000 +0900 648*cdf0e10cSrcweir@@ -11,6 +11,10 @@ 649*cdf0e10cSrcweir //----------------------------------------------------------------------------- 650*cdf0e10cSrcweir 651*cdf0e10cSrcweir 652*cdf0e10cSrcweir+#if __GNUC__ >=3 653*cdf0e10cSrcweir+#pragma GCC system_header 654*cdf0e10cSrcweir+#endif 655*cdf0e10cSrcweir+ 656*cdf0e10cSrcweir #define STRING_GUID(l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8 657*cdf0e10cSrcweir 658*cdf0e10cSrcweir #if defined(__midl) || defined(GEN_MIDL) 659*cdf0e10cSrcweir--- include/adoint.h.orig 2008-01-18 22:17:10.000000000 +0900 660*cdf0e10cSrcweir+++ include/adoint.h 2009-08-21 09:21:56.000000000 +0900 661*cdf0e10cSrcweir@@ -11,6 +11,9 @@ 662*cdf0e10cSrcweir //-------------------------------------------------------------------- 663*cdf0e10cSrcweir #ifndef _ADOINT_H_ 664*cdf0e10cSrcweir #define _ADOINT_H_ 665*cdf0e10cSrcweir+#if __GNUC__ >=3 666*cdf0e10cSrcweir+#pragma GCC system_header 667*cdf0e10cSrcweir+#endif 668*cdf0e10cSrcweir 669*cdf0e10cSrcweir #ifndef _INC_TCHAR 670*cdf0e10cSrcweir #include <tchar.h> 671*cdf0e10cSrcweir@@ -3494,7 +3497,7 @@ 672*cdf0e10cSrcweir #endif /* __ADOConnectionConstruction_INTERFACE_DEFINED__ */ 673*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Connection; 674*cdf0e10cSrcweir #ifdef __cplusplus 675*cdf0e10cSrcweir-Connection; 676*cdf0e10cSrcweir+//Connection; 677*cdf0e10cSrcweir #endif 678*cdf0e10cSrcweir #ifndef ___Record_INTERFACE_DEFINED__ 679*cdf0e10cSrcweir #define ___Record_INTERFACE_DEFINED__ 680*cdf0e10cSrcweir@@ -3793,7 +3796,7 @@ 681*cdf0e10cSrcweir #endif /* ___Record_INTERFACE_DEFINED__ */ 682*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Record; 683*cdf0e10cSrcweir #ifdef __cplusplus 684*cdf0e10cSrcweir-Record; 685*cdf0e10cSrcweir+//Record; 686*cdf0e10cSrcweir #endif 687*cdf0e10cSrcweir #ifndef ___Stream_INTERFACE_DEFINED__ 688*cdf0e10cSrcweir #define ___Stream_INTERFACE_DEFINED__ 689*cdf0e10cSrcweir@@ -4123,7 +4126,7 @@ 690*cdf0e10cSrcweir #endif /* ___Stream_INTERFACE_DEFINED__ */ 691*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Stream; 692*cdf0e10cSrcweir #ifdef __cplusplus 693*cdf0e10cSrcweir-Stream; 694*cdf0e10cSrcweir+//Stream; 695*cdf0e10cSrcweir #endif 696*cdf0e10cSrcweir #ifndef __ADORecordConstruction_INTERFACE_DEFINED__ 697*cdf0e10cSrcweir #define __ADORecordConstruction_INTERFACE_DEFINED__ 698*cdf0e10cSrcweir@@ -4405,11 +4408,11 @@ 699*cdf0e10cSrcweir #endif /* __ADOCommandConstruction_INTERFACE_DEFINED__ */ 700*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Command; 701*cdf0e10cSrcweir #ifdef __cplusplus 702*cdf0e10cSrcweir-Command; 703*cdf0e10cSrcweir+//Command; 704*cdf0e10cSrcweir #endif 705*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Recordset; 706*cdf0e10cSrcweir #ifdef __cplusplus 707*cdf0e10cSrcweir-Recordset; 708*cdf0e10cSrcweir+//Recordset; 709*cdf0e10cSrcweir #endif 710*cdf0e10cSrcweir #ifndef __Recordset15_INTERFACE_DEFINED__ 711*cdf0e10cSrcweir #define __Recordset15_INTERFACE_DEFINED__ 712*cdf0e10cSrcweir@@ -8305,7 +8308,7 @@ 713*cdf0e10cSrcweir #endif /* ___Parameter_INTERFACE_DEFINED__ */ 714*cdf0e10cSrcweir EXTERN_C const CLSID CLSID_Parameter; 715*cdf0e10cSrcweir #ifdef __cplusplus 716*cdf0e10cSrcweir-Parameter; 717*cdf0e10cSrcweir+//Parameter; 718*cdf0e10cSrcweir #endif 719*cdf0e10cSrcweir #ifndef __Parameters_INTERFACE_DEFINED__ 720*cdf0e10cSrcweir #define __Parameters_INTERFACE_DEFINED__ 721*cdf0e10cSrcweir--- include/bcrypt.h.orig 2008-01-18 22:17:12.000000000 +0900 722*cdf0e10cSrcweir+++ include/bcrypt.h 2008-04-10 22:57:54.410750000 +0900 723*cdf0e10cSrcweir@@ -40,12 +40,6 @@ 724*cdf0e10cSrcweir #define OPTIONAL 725*cdf0e10cSrcweir #endif 726*cdf0e10cSrcweir 727*cdf0e10cSrcweir-#if !defined(__midl) 728*cdf0e10cSrcweir-#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT)) 729*cdf0e10cSrcweir-#else 730*cdf0e10cSrcweir-#define BCRYPT_STRUCT_ALIGNMENT 731*cdf0e10cSrcweir-#endif /*!defined(__midl)*/ 732*cdf0e10cSrcweir- 733*cdf0e10cSrcweir // 734*cdf0e10cSrcweir // Alignment macros 735*cdf0e10cSrcweir // 736*cdf0e10cSrcweir@@ -57,11 +51,7 @@ 737*cdf0e10cSrcweir #define BCRYPT_OBJECT_ALIGNMENT 4 738*cdf0e10cSrcweir #endif 739*cdf0e10cSrcweir 740*cdf0e10cSrcweir-#if !defined(__midl) 741*cdf0e10cSrcweir-#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT)) 742*cdf0e10cSrcweir-#else 743*cdf0e10cSrcweir #define BCRYPT_STRUCT_ALIGNMENT 744*cdf0e10cSrcweir-#endif /*!defined(__midl)*/ 745*cdf0e10cSrcweir 746*cdf0e10cSrcweir // 747*cdf0e10cSrcweir // DeriveKey KDF Types 748*cdf0e10cSrcweir@@ -108,7 +98,11 @@ 749*cdf0e10cSrcweir 750*cdf0e10cSrcweir typedef BCRYPT_KEY_LENGTHS_STRUCT BCRYPT_AUTH_TAG_LENGTHS_STRUCT; 751*cdf0e10cSrcweir 752*cdf0e10cSrcweir-#pragma pack(push, BCRYPT_OBJECT_ALIGNMENT) 753*cdf0e10cSrcweir+#if defined(_IA64_) || defined(_AMD64_) 754*cdf0e10cSrcweir+#pragma pack(push, 8) 755*cdf0e10cSrcweir+#else 756*cdf0e10cSrcweir+#pragma pack(push, 4) 757*cdf0e10cSrcweir+#endif 758*cdf0e10cSrcweir typedef BCRYPT_STRUCT_ALIGNMENT struct _BCRYPT_OID 759*cdf0e10cSrcweir { 760*cdf0e10cSrcweir ULONG cbOID; 761*cdf0e10cSrcweir--- include/commctrl.h.orig 2008-01-18 22:17:14.000000000 +0900 762*cdf0e10cSrcweir+++ include/commctrl.h 2009-08-21 09:21:56.000000000 +0900 763*cdf0e10cSrcweir@@ -14,6 +14,14 @@ 764*cdf0e10cSrcweir #ifndef _INC_COMMCTRL 765*cdf0e10cSrcweir #define _INC_COMMCTRL 766*cdf0e10cSrcweir 767*cdf0e10cSrcweir+#define __in 768*cdf0e10cSrcweir+#define __out 769*cdf0e10cSrcweir+#ifdef __cplusplus 770*cdf0e10cSrcweir+#define __inline inline 771*cdf0e10cSrcweir+#else 772*cdf0e10cSrcweir+#define __inline static __inline__ 773*cdf0e10cSrcweir+#endif 774*cdf0e10cSrcweir+ 775*cdf0e10cSrcweir #if defined(_MSC_VER) && (_MSC_VER >= 1200) 776*cdf0e10cSrcweir #pragma warning(push) 777*cdf0e10cSrcweir #pragma warning(disable:4001) /* nonstandard extension : single line comment */ 778*cdf0e10cSrcweir@@ -369,8 +377,10 @@ 779*cdf0e10cSrcweir 780*cdf0e10cSrcweir // Shell reserved (0U-580U) - (0U-589U) 781*cdf0e10cSrcweir 782*cdf0e10cSrcweir+#ifndef CDN_FIRST 783*cdf0e10cSrcweir #define CDN_FIRST (0U-601U) // common dialog (new) 784*cdf0e10cSrcweir #define CDN_LAST (0U-699U) 785*cdf0e10cSrcweir+#endif 786*cdf0e10cSrcweir 787*cdf0e10cSrcweir #define TBN_FIRST (0U-700U) // toolbar 788*cdf0e10cSrcweir #define TBN_LAST (0U-720U) 789*cdf0e10cSrcweir@@ -683,7 +693,7 @@ 790*cdf0e10cSrcweir #define ILP_DOWNLEVEL 1 // Write or reads the stream using downlevel sematics. 791*cdf0e10cSrcweir 792*cdf0e10cSrcweir 793*cdf0e10cSrcweir-WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv); 794*cdf0e10cSrcweir+//WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv); 795*cdf0e10cSrcweir WINCOMMCTRLAPI HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD dwFlags, LPSTREAM pstm); 796*cdf0e10cSrcweir #endif 797*cdf0e10cSrcweir 798*cdf0e10cSrcweir@@ -713,7 +723,7 @@ 799*cdf0e10cSrcweir #endif 800*cdf0e10cSrcweir 801*cdf0e10cSrcweir #if (_WIN32_WINNT >= 0x0501) 802*cdf0e10cSrcweir-WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv); 803*cdf0e10cSrcweir+//WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv); 804*cdf0e10cSrcweir 805*cdf0e10cSrcweir #ifdef __cplusplus 806*cdf0e10cSrcweir FORCEINLINE HIMAGELIST IImageListToHIMAGELIST(struct IImageList *himl) 807*cdf0e10cSrcweir@@ -8056,8 +8066,10 @@ 808*cdf0e10cSrcweir #if (_WIN32_WINNT >= 0x0501) 809*cdf0e10cSrcweir 810*cdf0e10cSrcweir // custom combobox control messages 811*cdf0e10cSrcweir+#ifndef CB_SETMINVISIBLE 812*cdf0e10cSrcweir #define CB_SETMINVISIBLE (CBM_FIRST + 1) 813*cdf0e10cSrcweir #define CB_GETMINVISIBLE (CBM_FIRST + 2) 814*cdf0e10cSrcweir+#endif 815*cdf0e10cSrcweir #define CB_SETCUEBANNER (CBM_FIRST + 3) 816*cdf0e10cSrcweir #define CB_GETCUEBANNER (CBM_FIRST + 4) 817*cdf0e10cSrcweir 818*cdf0e10cSrcweir@@ -8651,7 +8663,7 @@ 819*cdf0e10cSrcweir 820*cdf0e10cSrcweir #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ 821*cdf0e10cSrcweir #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) 822*cdf0e10cSrcweir-#include "commctrl.inl" 823*cdf0e10cSrcweir+//#include "commctrl.inl" 824*cdf0e10cSrcweir #endif /* ISOLATION_AWARE_ENABLED */ 825*cdf0e10cSrcweir #endif /* RC */ 826*cdf0e10cSrcweir 827*cdf0e10cSrcweir@@ -8666,6 +8678,10 @@ 828*cdf0e10cSrcweir #pragma warning(pop) 829*cdf0e10cSrcweir #endif 830*cdf0e10cSrcweir 831*cdf0e10cSrcweir+#undef __in 832*cdf0e10cSrcweir+#undef __out 833*cdf0e10cSrcweir+#undef __inline 834*cdf0e10cSrcweir+ 835*cdf0e10cSrcweir #endif /* _INC_COMMCTRL */ 836*cdf0e10cSrcweir 837*cdf0e10cSrcweir 838*cdf0e10cSrcweir--- include/control.h.orig 2008-01-18 22:17:14.000000000 +0900 839*cdf0e10cSrcweir+++ include/control.h 2009-08-21 09:21:56.000000000 +0900 840*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 841*cdf0e10cSrcweir+#if __GNUC__ >=3 842*cdf0e10cSrcweir+#pragma GCC system_header 843*cdf0e10cSrcweir+#endif 844*cdf0e10cSrcweir 845*cdf0e10cSrcweir 846*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 847*cdf0e10cSrcweir--- include/dispex.h.orig 2008-01-18 22:17:16.000000000 +0900 848*cdf0e10cSrcweir+++ include/dispex.h 2009-08-21 09:21:56.000000000 +0900 849*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 850*cdf0e10cSrcweir+#if __GNUC__ >=3 851*cdf0e10cSrcweir+#pragma GCC system_header 852*cdf0e10cSrcweir+#endif 853*cdf0e10cSrcweir 854*cdf0e10cSrcweir 855*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 856*cdf0e10cSrcweir--- include/filter.h.orig 2008-01-18 22:17:18.000000000 +0900 857*cdf0e10cSrcweir+++ include/filter.h 2009-08-21 09:21:56.000000000 +0900 858*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 859*cdf0e10cSrcweir+#if __GNUC__ >=3 860*cdf0e10cSrcweir+#pragma GCC system_header 861*cdf0e10cSrcweir+#endif 862*cdf0e10cSrcweir 863*cdf0e10cSrcweir 864*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 865*cdf0e10cSrcweir--- include/gdiplusbitmap.h.orig 2008-01-18 22:17:46.000000000 +0900 866*cdf0e10cSrcweir+++ include/gdiplusbitmap.h 2009-08-21 09:21:56.000000000 +0900 867*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 868*cdf0e10cSrcweir+#if __GNUC__ >=3 869*cdf0e10cSrcweir+#pragma GCC system_header 870*cdf0e10cSrcweir+#endif 871*cdf0e10cSrcweir /**************************************************************************\ 872*cdf0e10cSrcweir * 873*cdf0e10cSrcweir * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved. 874*cdf0e10cSrcweir--- include/gdiplusbrush.h.orig 2008-01-18 22:17:46.000000000 +0900 875*cdf0e10cSrcweir+++ include/gdiplusbrush.h 2009-08-21 09:21:56.000000000 +0900 876*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 877*cdf0e10cSrcweir+#if __GNUC__ >=3 878*cdf0e10cSrcweir+#pragma GCC system_header 879*cdf0e10cSrcweir+#endif 880*cdf0e10cSrcweir /**************************************************************************\ 881*cdf0e10cSrcweir * 882*cdf0e10cSrcweir * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved. 883*cdf0e10cSrcweir--- include/gdiplusenums.h.orig 2008-01-18 22:17:46.000000000 +0900 884*cdf0e10cSrcweir+++ include/gdiplusenums.h 2009-08-21 09:21:56.000000000 +0900 885*cdf0e10cSrcweir@@ -542,7 +542,7 @@ 886*cdf0e10cSrcweir 887*cdf0e10cSrcweir #define GDIP_EMFPLUS_RECORD_BASE 0x00004000 888*cdf0e10cSrcweir #define GDIP_WMF_RECORD_BASE 0x00010000 889*cdf0e10cSrcweir-#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((EmfPlusRecordType)((n) | GDIP_WMF_RECORD_BASE)) 890*cdf0e10cSrcweir+#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((n) | GDIP_WMF_RECORD_BASE) 891*cdf0e10cSrcweir #define GDIP_EMFPLUS_RECORD_TO_WMF(n) ((n) & (~GDIP_WMF_RECORD_BASE)) 892*cdf0e10cSrcweir #define GDIP_IS_WMF_RECORDTYPE(n) (((n) & GDIP_WMF_RECORD_BASE) != 0) 893*cdf0e10cSrcweir 894*cdf0e10cSrcweir--- include/gdiplusfont.h.orig 2008-01-18 22:17:46.000000000 +0900 895*cdf0e10cSrcweir+++ include/gdiplusfont.h 2009-08-21 09:21:56.000000000 +0900 896*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 897*cdf0e10cSrcweir+#if __GNUC__ >=3 898*cdf0e10cSrcweir+#pragma GCC system_header 899*cdf0e10cSrcweir+#endif 900*cdf0e10cSrcweir /**************************************************************************\ 901*cdf0e10cSrcweir * 902*cdf0e10cSrcweir * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved. 903*cdf0e10cSrcweir--- include/gdiplusheaders.h.orig 2008-01-18 22:17:46.000000000 +0900 904*cdf0e10cSrcweir+++ include/gdiplusheaders.h 2008-03-28 21:44:34.907750000 +0900 905*cdf0e10cSrcweir@@ -704,7 +704,7 @@ 906*cdf0e10cSrcweir 907*cdf0e10cSrcweir class CachedBitmap : public GdiplusBase 908*cdf0e10cSrcweir { 909*cdf0e10cSrcweir- friend Graphics; 910*cdf0e10cSrcweir+ friend class Graphics; 911*cdf0e10cSrcweir 912*cdf0e10cSrcweir public: 913*cdf0e10cSrcweir CachedBitmap(IN Bitmap *bitmap, 914*cdf0e10cSrcweir@@ -888,7 +888,7 @@ 915*cdf0e10cSrcweir 916*cdf0e10cSrcweir UINT GetDownLevelRasterizationLimit() const; 917*cdf0e10cSrcweir 918*cdf0e10cSrcweir- static UINT Metafile::EmfToWmfBits( 919*cdf0e10cSrcweir+ static UINT EmfToWmfBits( 920*cdf0e10cSrcweir IN HENHMETAFILE hemf, 921*cdf0e10cSrcweir IN UINT cbData16, 922*cdf0e10cSrcweir OUT LPBYTE pData16, 923*cdf0e10cSrcweir--- include/gdiplusimageattributes.h.orig 2008-01-18 22:17:46.000000000 +0900 924*cdf0e10cSrcweir+++ include/gdiplusimageattributes.h 2009-08-21 09:21:56.000000000 +0900 925*cdf0e10cSrcweir@@ -32,6 +32,9 @@ 926*cdf0e10cSrcweir 927*cdf0e10cSrcweir #ifndef _GDIPLUSIMAGEATTRIBUTES_H 928*cdf0e10cSrcweir #define _GDIPLUSIMAGEATTRIBUTES_H 929*cdf0e10cSrcweir+#if __GNUC__ >=3 930*cdf0e10cSrcweir+#pragma GCC system_header 931*cdf0e10cSrcweir+#endif 932*cdf0e10cSrcweir 933*cdf0e10cSrcweir class GpImageAttributes; 934*cdf0e10cSrcweir 935*cdf0e10cSrcweir--- include/gdiplusimaging.h.orig 2008-01-18 22:17:46.000000000 +0900 936*cdf0e10cSrcweir+++ include/gdiplusimaging.h 2009-08-21 09:21:56.000000000 +0900 937*cdf0e10cSrcweir@@ -160,7 +160,7 @@ 938*cdf0e10cSrcweir UINT Width; 939*cdf0e10cSrcweir UINT Height; 940*cdf0e10cSrcweir INT Stride; 941*cdf0e10cSrcweir- PixelFormat PixelFormat; 942*cdf0e10cSrcweir+ ::Gdiplus::PixelFormat PixelFormat; 943*cdf0e10cSrcweir VOID* Scan0; 944*cdf0e10cSrcweir UINT_PTR Reserved; 945*cdf0e10cSrcweir }; 946*cdf0e10cSrcweir--- include/gdiplusmatrix.h.orig 2008-01-18 22:17:46.000000000 +0900 947*cdf0e10cSrcweir+++ include/gdiplusmatrix.h 2009-08-21 09:21:56.000000000 +0900 948*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 949*cdf0e10cSrcweir+#if __GNUC__ >=3 950*cdf0e10cSrcweir+#pragma GCC system_header 951*cdf0e10cSrcweir+#endif 952*cdf0e10cSrcweir /**************************************************************************\ 953*cdf0e10cSrcweir * 954*cdf0e10cSrcweir * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved. 955*cdf0e10cSrcweir--- include/gdipluspath.h.orig 2008-01-18 22:17:46.000000000 +0900 956*cdf0e10cSrcweir+++ include/gdipluspath.h 2009-08-21 09:21:56.000000000 +0900 957*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 958*cdf0e10cSrcweir+#if __GNUC__ >=3 959*cdf0e10cSrcweir+#pragma GCC system_header 960*cdf0e10cSrcweir+#endif 961*cdf0e10cSrcweir /**************************************************************************\ 962*cdf0e10cSrcweir * 963*cdf0e10cSrcweir * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved. 964*cdf0e10cSrcweir--- include/gdipluspen.h.orig 2008-01-18 22:17:46.000000000 +0900 965*cdf0e10cSrcweir+++ include/gdipluspen.h 2009-08-21 09:21:56.000000000 +0900 966*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 967*cdf0e10cSrcweir+#if __GNUC__ >=3 968*cdf0e10cSrcweir+#pragma GCC system_header 969*cdf0e10cSrcweir+#endif 970*cdf0e10cSrcweir /**************************************************************************\ 971*cdf0e10cSrcweir * 972*cdf0e10cSrcweir * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved. 973*cdf0e10cSrcweir--- include/gdiplusregion.h.orig 2008-01-18 22:17:46.000000000 +0900 974*cdf0e10cSrcweir+++ include/gdiplusregion.h 2009-08-21 09:21:56.000000000 +0900 975*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 976*cdf0e10cSrcweir+#if __GNUC__ >=3 977*cdf0e10cSrcweir+#pragma GCC system_header 978*cdf0e10cSrcweir+#endif 979*cdf0e10cSrcweir /**************************************************************************\ 980*cdf0e10cSrcweir * 981*cdf0e10cSrcweir * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved. 982*cdf0e10cSrcweir--- include/gdiplusstringformat.h.orig 2008-01-18 22:17:46.000000000 +0900 983*cdf0e10cSrcweir+++ include/gdiplusstringformat.h 2009-08-21 09:21:56.000000000 +0900 984*cdf0e10cSrcweir@@ -217,7 +217,7 @@ 985*cdf0e10cSrcweir )); 986*cdf0e10cSrcweir } 987*cdf0e10cSrcweir 988*cdf0e10cSrcweir- StringTrimming StringFormat::GetTrimming() const 989*cdf0e10cSrcweir+ StringTrimming GetTrimming() const 990*cdf0e10cSrcweir { 991*cdf0e10cSrcweir StringTrimming trimming; 992*cdf0e10cSrcweir SetStatus(DllExports::GdipGetStringFormatTrimming( 993*cdf0e10cSrcweir--- include/imm.h.orig 2008-01-18 22:17:20.000000000 +0900 994*cdf0e10cSrcweir+++ include/imm.h 2009-08-21 09:21:56.000000000 +0900 995*cdf0e10cSrcweir@@ -7,6 +7,13 @@ 996*cdf0e10cSrcweir #ifndef _IMM_ 997*cdf0e10cSrcweir #define _IMM_ 998*cdf0e10cSrcweir 999*cdf0e10cSrcweir+#define __in 1000*cdf0e10cSrcweir+#define __out 1001*cdf0e10cSrcweir+#ifdef __cplusplus 1002*cdf0e10cSrcweir+#define __inline inline 1003*cdf0e10cSrcweir+#else 1004*cdf0e10cSrcweir+#define __inline static __inline__ 1005*cdf0e10cSrcweir+#endif 1006*cdf0e10cSrcweir 1007*cdf0e10cSrcweir #ifdef __cplusplus 1008*cdf0e10cSrcweir extern "C" { 1009*cdf0e10cSrcweir@@ -715,5 +722,9 @@ 1010*cdf0e10cSrcweir } 1011*cdf0e10cSrcweir #endif 1012*cdf0e10cSrcweir 1013*cdf0e10cSrcweir+#undef __in 1014*cdf0e10cSrcweir+#undef __out 1015*cdf0e10cSrcweir+#undef __inline 1016*cdf0e10cSrcweir+ 1017*cdf0e10cSrcweir #endif // _IMM_ 1018*cdf0e10cSrcweir 1019*cdf0e10cSrcweir--- include/imagehlp.h.orig 2008-01-18 22:17:20.000000000 +0900 1020*cdf0e10cSrcweir+++ include/imagehlp.h 2009-08-21 09:21:56.000000000 +0900 1021*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1022*cdf0e10cSrcweir+#if __GNUC__ >=3 1023*cdf0e10cSrcweir+#pragma GCC system_header 1024*cdf0e10cSrcweir+#endif 1025*cdf0e10cSrcweir /*++ BUILD Version: 0000 Increment this if a change has global effects 1026*cdf0e10cSrcweir 1027*cdf0e10cSrcweir Copyright (c) Microsoft Corporation. All rights reserved. 1028*cdf0e10cSrcweir@@ -59,6 +62,13 @@ 1029*cdf0e10cSrcweir #include <wintrust.h> 1030*cdf0e10cSrcweir #endif 1031*cdf0e10cSrcweir 1032*cdf0e10cSrcweir+#define __in 1033*cdf0e10cSrcweir+#define __out 1034*cdf0e10cSrcweir+#ifdef __cplusplus 1035*cdf0e10cSrcweir+#define __inline inline 1036*cdf0e10cSrcweir+#else 1037*cdf0e10cSrcweir+#define __inline static __inline__ 1038*cdf0e10cSrcweir+#endif 1039*cdf0e10cSrcweir 1040*cdf0e10cSrcweir #ifdef __cplusplus 1041*cdf0e10cSrcweir extern "C" { 1042*cdf0e10cSrcweir@@ -407,7 +417,7 @@ 1043*cdf0e10cSrcweir IMAGEAPI 1044*cdf0e10cSrcweir TouchFileTimes ( 1045*cdf0e10cSrcweir __in HANDLE FileHandle, 1046*cdf0e10cSrcweir- __in_opt PSYSTEMTIME pSystemTime 1047*cdf0e10cSrcweir+ __in_opt LPSYSTEMTIME pSystemTime 1048*cdf0e10cSrcweir ); 1049*cdf0e10cSrcweir 1050*cdf0e10cSrcweir BOOL 1051*cdf0e10cSrcweir@@ -3950,7 +3960,7 @@ 1052*cdf0e10cSrcweir // ThreadId must be 4 bytes on all architectures. 1053*cdf0e10cSrcweir // 1054*cdf0e10cSrcweir 1055*cdf0e10cSrcweir-C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4); 1056*cdf0e10cSrcweir+//C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4); 1057*cdf0e10cSrcweir 1058*cdf0e10cSrcweir typedef struct _MINIDUMP_THREAD { 1059*cdf0e10cSrcweir ULONG32 ThreadId; 1060*cdf0e10cSrcweir@@ -4684,5 +4694,9 @@ 1061*cdf0e10cSrcweir #endif 1062*cdf0e10cSrcweir 1063*cdf0e10cSrcweir 1064*cdf0e10cSrcweir+#undef __in 1065*cdf0e10cSrcweir+#undef __out 1066*cdf0e10cSrcweir+#undef __inline 1067*cdf0e10cSrcweir+ 1068*cdf0e10cSrcweir #endif // _IMAGEHLP_ 1069*cdf0e10cSrcweir 1070*cdf0e10cSrcweir--- include/mapiwin.h.orig 2008-01-18 22:17:22.000000000 +0900 1071*cdf0e10cSrcweir+++ include/mapiwin.h 2009-08-21 09:21:56.000000000 +0900 1072*cdf0e10cSrcweir@@ -428,5 +428,5 @@ 1073*cdf0e10cSrcweir #endif 1074*cdf0e10cSrcweir 1075*cdf0e10cSrcweir #endif /* __MAPIWIN_H__ */ 1076*cdf0e10cSrcweir- 1077*cdf0e10cSrcweir+ 1078*cdf0e10cSrcweir 1079*cdf0e10cSrcweir--- include/msdasc.h.orig 2008-01-18 22:17:26.000000000 +0900 1080*cdf0e10cSrcweir+++ include/msdasc.h 2009-08-21 09:21:56.000000000 +0900 1081*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1082*cdf0e10cSrcweir+#if __GNUC__ >=3 1083*cdf0e10cSrcweir+#pragma GCC system_header 1084*cdf0e10cSrcweir+#endif 1085*cdf0e10cSrcweir 1086*cdf0e10cSrcweir 1087*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1088*cdf0e10cSrcweir--- include/msi.h.orig 2008-01-18 22:17:28.000000000 +0900 1089*cdf0e10cSrcweir+++ include/msi.h 2009-08-21 09:21:56.000000000 +0900 1090*cdf0e10cSrcweir@@ -59,6 +59,14 @@ 1091*cdf0e10cSrcweir #endif // _MSI_NO_CRYPTO 1092*cdf0e10cSrcweir #endif //(_WIN32_MSI >= 150) 1093*cdf0e10cSrcweir 1094*cdf0e10cSrcweir+#define __in 1095*cdf0e10cSrcweir+#define __out 1096*cdf0e10cSrcweir+#ifdef __cplusplus 1097*cdf0e10cSrcweir+#define __inline inline 1098*cdf0e10cSrcweir+#else 1099*cdf0e10cSrcweir+#define __inline static __inline__ 1100*cdf0e10cSrcweir+#endif 1101*cdf0e10cSrcweir+ 1102*cdf0e10cSrcweir // -------------------------------------------------------------------------- 1103*cdf0e10cSrcweir // Installer generic handle definitions 1104*cdf0e10cSrcweir // -------------------------------------------------------------------------- 1105*cdf0e10cSrcweir@@ -2248,5 +2256,9 @@ 1106*cdf0e10cSrcweir // LOCALIZE END 1107*cdf0e10cSrcweir 1108*cdf0e10cSrcweir 1109*cdf0e10cSrcweir+#undef __in 1110*cdf0e10cSrcweir+#undef __out 1111*cdf0e10cSrcweir+#undef __inline 1112*cdf0e10cSrcweir+ 1113*cdf0e10cSrcweir #endif // _MSI_H_ 1114*cdf0e10cSrcweir 1115*cdf0e10cSrcweir--- include/msiquery.h.orig 2008-01-18 22:17:28.000000000 +0900 1116*cdf0e10cSrcweir+++ include/msiquery.h 2009-08-21 09:21:56.000000000 +0900 1117*cdf0e10cSrcweir@@ -21,6 +21,14 @@ 1118*cdf0e10cSrcweir #define _MSIQUERY_H_ 1119*cdf0e10cSrcweir #include "msi.h" // INSTALLSTATE 1120*cdf0e10cSrcweir 1121*cdf0e10cSrcweir+#define __in 1122*cdf0e10cSrcweir+#define __out 1123*cdf0e10cSrcweir+#ifdef __cplusplus 1124*cdf0e10cSrcweir+#define __inline inline 1125*cdf0e10cSrcweir+#else 1126*cdf0e10cSrcweir+#define __inline static __inline__ 1127*cdf0e10cSrcweir+#endif 1128*cdf0e10cSrcweir+ 1129*cdf0e10cSrcweir #define MSI_NULL_INTEGER 0x80000000 // integer value reserved for null 1130*cdf0e10cSrcweir 1131*cdf0e10cSrcweir // MsiOpenDatabase persist predefine values, otherwise output database path is used 1132*cdf0e10cSrcweir@@ -1026,5 +1034,9 @@ 1133*cdf0e10cSrcweir } 1134*cdf0e10cSrcweir #endif 1135*cdf0e10cSrcweir 1136*cdf0e10cSrcweir+#undef __in 1137*cdf0e10cSrcweir+#undef __out 1138*cdf0e10cSrcweir+#undef __inline 1139*cdf0e10cSrcweir+ 1140*cdf0e10cSrcweir #endif // _MSIQUERY_H_ 1141*cdf0e10cSrcweir 1142*cdf0e10cSrcweir--- include/multimon.h.orig 2008-01-18 22:17:30.000000000 +0900 1143*cdf0e10cSrcweir+++ include/multimon.h 2009-08-21 09:21:56.000000000 +0900 1144*cdf0e10cSrcweir@@ -175,7 +175,7 @@ 1145*cdf0e10cSrcweir 1146*cdf0e10cSrcweir BOOL IsPlatformNT() 1147*cdf0e10cSrcweir { 1148*cdf0e10cSrcweir- OSVERSIONINFOA osvi = {0}; 1149*cdf0e10cSrcweir+ OSVERSIONINFOA osvi; 1150*cdf0e10cSrcweir osvi.dwOSVersionInfoSize = sizeof(osvi); 1151*cdf0e10cSrcweir GetVersionExA((OSVERSIONINFOA*)&osvi); 1152*cdf0e10cSrcweir return (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId); 1153*cdf0e10cSrcweir--- include/ntquery.h.orig 2008-01-18 22:17:30.000000000 +0900 1154*cdf0e10cSrcweir+++ include/ntquery.h 2009-02-16 21:34:39.065125000 +0900 1155*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1156*cdf0e10cSrcweir+#if __GNUC__ >=3 1157*cdf0e10cSrcweir+#pragma GCC system_header 1158*cdf0e10cSrcweir+#endif 1159*cdf0e10cSrcweir //+--------------------------------------------------------------------------- 1160*cdf0e10cSrcweir // 1161*cdf0e10cSrcweir // Microsoft Windows 1162*cdf0e10cSrcweir@@ -18,6 +21,14 @@ 1163*cdf0e10cSrcweir 1164*cdf0e10cSrcweir #include "stgprop.h" 1165*cdf0e10cSrcweir 1166*cdf0e10cSrcweir+#define __in 1167*cdf0e10cSrcweir+#define __out 1168*cdf0e10cSrcweir+#ifdef __cplusplus 1169*cdf0e10cSrcweir+#define __inline inline 1170*cdf0e10cSrcweir+#else 1171*cdf0e10cSrcweir+#define __inline static __inline__ 1172*cdf0e10cSrcweir+#endif 1173*cdf0e10cSrcweir+ 1174*cdf0e10cSrcweir #if defined(__cplusplus) 1175*cdf0e10cSrcweir extern "C" 1176*cdf0e10cSrcweir { 1177*cdf0e10cSrcweir@@ -404,6 +415,10 @@ 1178*cdf0e10cSrcweir } 1179*cdf0e10cSrcweir #endif 1180*cdf0e10cSrcweir 1181*cdf0e10cSrcweir+#undef __in 1182*cdf0e10cSrcweir+#undef __out 1183*cdf0e10cSrcweir+#undef __inline 1184*cdf0e10cSrcweir+ 1185*cdf0e10cSrcweir #endif // __NTQUERY_H__ 1186*cdf0e10cSrcweir 1187*cdf0e10cSrcweir 1188*cdf0e10cSrcweir--- include/oaidl.h.orig 2008-12-06 11:32:03.000000000 +0900 1189*cdf0e10cSrcweir+++ include/oaidl.h 2010-02-27 13:28:29.448250000 +0900 1190*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1191*cdf0e10cSrcweir+#if __GNUC__ >=3 1192*cdf0e10cSrcweir+#pragma GCC system_header 1193*cdf0e10cSrcweir+#endif 1194*cdf0e10cSrcweir 1195*cdf0e10cSrcweir 1196*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1197*cdf0e10cSrcweir@@ -442,7 +445,7 @@ 1198*cdf0e10cSrcweir FLOAT fltVal; 1199*cdf0e10cSrcweir DOUBLE dblVal; 1200*cdf0e10cSrcweir VARIANT_BOOL boolVal; 1201*cdf0e10cSrcweir- _VARIANT_BOOL bool; 1202*cdf0e10cSrcweir+// _VARIANT_BOOL bool; 1203*cdf0e10cSrcweir SCODE scode; 1204*cdf0e10cSrcweir CY cyVal; 1205*cdf0e10cSrcweir DATE date; 1206*cdf0e10cSrcweir--- include/ocidl.h.orig 2008-01-18 22:17:32.000000000 +0900 1207*cdf0e10cSrcweir+++ include/ocidl.h 2009-08-21 09:21:56.000000000 +0900 1208*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1209*cdf0e10cSrcweir+#if __GNUC__ >=3 1210*cdf0e10cSrcweir+#pragma GCC system_header 1211*cdf0e10cSrcweir+#endif 1212*cdf0e10cSrcweir 1213*cdf0e10cSrcweir 1214*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1215*cdf0e10cSrcweir@@ -294,6 +297,14 @@ 1216*cdf0e10cSrcweir #include "servprov.h" 1217*cdf0e10cSrcweir #include "urlmon.h" 1218*cdf0e10cSrcweir 1219*cdf0e10cSrcweir+#define __in 1220*cdf0e10cSrcweir+#define __out 1221*cdf0e10cSrcweir+#ifdef __cplusplus 1222*cdf0e10cSrcweir+#define __inline inline 1223*cdf0e10cSrcweir+#else 1224*cdf0e10cSrcweir+#define __inline static __inline__ 1225*cdf0e10cSrcweir+#endif 1226*cdf0e10cSrcweir+ 1227*cdf0e10cSrcweir #ifdef __cplusplus 1228*cdf0e10cSrcweir extern "C"{ 1229*cdf0e10cSrcweir #endif 1230*cdf0e10cSrcweir@@ -4595,11 +4606,13 @@ 1231*cdf0e10cSrcweir HITRESULT_HIT = 3 1232*cdf0e10cSrcweir } HITRESULT; 1233*cdf0e10cSrcweir 1234*cdf0e10cSrcweir+#if 0 1235*cdf0e10cSrcweir typedef /* [v1_enum] */ 1236*cdf0e10cSrcweir enum tagDVASPECT2 1237*cdf0e10cSrcweir { DVASPECT_OPAQUE = 16, 1238*cdf0e10cSrcweir DVASPECT_TRANSPARENT = 32 1239*cdf0e10cSrcweir } DVASPECT2; 1240*cdf0e10cSrcweir+#endif 1241*cdf0e10cSrcweir 1242*cdf0e10cSrcweir typedef struct tagExtentInfo 1243*cdf0e10cSrcweir { 1244*cdf0e10cSrcweir@@ -6554,6 +6567,10 @@ 1245*cdf0e10cSrcweir } 1246*cdf0e10cSrcweir #endif 1247*cdf0e10cSrcweir 1248*cdf0e10cSrcweir+#undef __in 1249*cdf0e10cSrcweir+#undef __out 1250*cdf0e10cSrcweir+#undef __inline 1251*cdf0e10cSrcweir+ 1252*cdf0e10cSrcweir #endif 1253*cdf0e10cSrcweir 1254*cdf0e10cSrcweir 1255*cdf0e10cSrcweir--- include/oleauto.h.orig 2008-01-18 22:17:32.000000000 +0900 1256*cdf0e10cSrcweir+++ include/oleauto.h 2009-08-21 09:21:56.000000000 +0900 1257*cdf0e10cSrcweir@@ -56,6 +56,14 @@ 1258*cdf0e10cSrcweir /* pull in the MIDL generated header */ 1259*cdf0e10cSrcweir #include <oaidl.h> 1260*cdf0e10cSrcweir 1261*cdf0e10cSrcweir+#define __in 1262*cdf0e10cSrcweir+#define __out 1263*cdf0e10cSrcweir+#ifdef __cplusplus 1264*cdf0e10cSrcweir+#define __inline inline 1265*cdf0e10cSrcweir+#else 1266*cdf0e10cSrcweir+#define __inline static __inline__ 1267*cdf0e10cSrcweir+#endif 1268*cdf0e10cSrcweir+ 1269*cdf0e10cSrcweir 1270*cdf0e10cSrcweir /*---------------------------------------------------------------------*/ 1271*cdf0e10cSrcweir /* BSTR API */ 1272*cdf0e10cSrcweir@@ -1160,7 +1168,7 @@ 1273*cdf0e10cSrcweir 1274*cdf0e10cSrcweir // Declare variant access functions. 1275*cdf0e10cSrcweir 1276*cdf0e10cSrcweir-#if __STDC__ || defined(NONAMELESSUNION) 1277*cdf0e10cSrcweir+#ifdef NONAMELESSUNION 1278*cdf0e10cSrcweir #define V_UNION(X, Y) ((X)->n1.n2.n3.Y) 1279*cdf0e10cSrcweir #define V_VT(X) ((X)->n1.n2.vt) 1280*cdf0e10cSrcweir #define V_RECORDINFO(X) ((X)->n1.n2.n3.brecVal.pRecInfo) 1281*cdf0e10cSrcweir@@ -1242,5 +1250,9 @@ 1282*cdf0e10cSrcweir #include <poppack.h> 1283*cdf0e10cSrcweir #endif // RC_INVOKED 1284*cdf0e10cSrcweir 1285*cdf0e10cSrcweir+#undef __in 1286*cdf0e10cSrcweir+#undef __out 1287*cdf0e10cSrcweir+#undef __inline 1288*cdf0e10cSrcweir+ 1289*cdf0e10cSrcweir #endif // __OLEAUTO_H__ 1290*cdf0e10cSrcweir 1291*cdf0e10cSrcweir--- include/olectl.h.orig 2008-01-18 22:17:32.000000000 +0900 1292*cdf0e10cSrcweir+++ include/olectl.h 2009-08-21 09:21:56.000000000 +0900 1293*cdf0e10cSrcweir@@ -28,6 +28,14 @@ 1294*cdf0e10cSrcweir #include <ocidl.h> 1295*cdf0e10cSrcweir #endif // _MAC 1296*cdf0e10cSrcweir 1297*cdf0e10cSrcweir+#define __in 1298*cdf0e10cSrcweir+#define __out 1299*cdf0e10cSrcweir+#ifdef __cplusplus 1300*cdf0e10cSrcweir+#define __inline inline 1301*cdf0e10cSrcweir+#else 1302*cdf0e10cSrcweir+#define __inline static __inline__ 1303*cdf0e10cSrcweir+#endif 1304*cdf0e10cSrcweir+ 1305*cdf0e10cSrcweir #ifdef _OLEAUT32_ 1306*cdf0e10cSrcweir #define WINOLECTLAPI STDAPI 1307*cdf0e10cSrcweir #define WINOLECTLAPI_(type) STDAPI_(type) 1308*cdf0e10cSrcweir@@ -616,5 +624,9 @@ 1309*cdf0e10cSrcweir 1310*cdf0e10cSrcweir #endif // defined(__MKTYPLIB__) || defined(__midl) 1311*cdf0e10cSrcweir 1312*cdf0e10cSrcweir+#undef __in 1313*cdf0e10cSrcweir+#undef __out 1314*cdf0e10cSrcweir+#undef __inline 1315*cdf0e10cSrcweir+ 1316*cdf0e10cSrcweir #endif // _OLECTL_H_ 1317*cdf0e10cSrcweir 1318*cdf0e10cSrcweir--- include/oledb.h.orig 2008-01-18 22:17:32.000000000 +0900 1319*cdf0e10cSrcweir+++ include/oledb.h 2009-08-21 09:21:56.000000000 +0900 1320*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1321*cdf0e10cSrcweir+#if __GNUC__ >=3 1322*cdf0e10cSrcweir+#pragma GCC system_header 1323*cdf0e10cSrcweir+#endif 1324*cdf0e10cSrcweir 1325*cdf0e10cSrcweir 1326*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1327*cdf0e10cSrcweir@@ -797,7 +800,7 @@ 1328*cdf0e10cSrcweir 1329*cdf0e10cSrcweir //@@@+ V2.0 1330*cdf0e10cSrcweir #if( OLEDBVER >= 0x0200 ) 1331*cdf0e10cSrcweir-#if !defined(_WINBASE_) && !defined(_FILETIME_) 1332*cdf0e10cSrcweir+#if !defined(_WINBASE_H) && !defined(_FILETIME_) 1333*cdf0e10cSrcweir #define _FILETIME_ 1334*cdf0e10cSrcweir typedef struct _FILETIME { 1335*cdf0e10cSrcweir DWORD dwLowDateTime; 1336*cdf0e10cSrcweir--- include/oleidl.h.orig 2008-01-18 22:17:32.000000000 +0900 1337*cdf0e10cSrcweir+++ include/oleidl.h 2009-08-21 09:21:56.000000000 +0900 1338*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1339*cdf0e10cSrcweir+#if __GNUC__ >=3 1340*cdf0e10cSrcweir+#pragma GCC system_header 1341*cdf0e10cSrcweir+#endif 1342*cdf0e10cSrcweir 1343*cdf0e10cSrcweir 1344*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1345*cdf0e10cSrcweir@@ -189,6 +192,14 @@ 1346*cdf0e10cSrcweir /* header files for imported files */ 1347*cdf0e10cSrcweir #include "objidl.h" 1348*cdf0e10cSrcweir 1349*cdf0e10cSrcweir+#define __in 1350*cdf0e10cSrcweir+#define __out 1351*cdf0e10cSrcweir+#ifdef __cplusplus 1352*cdf0e10cSrcweir+#define __inline inline 1353*cdf0e10cSrcweir+#else 1354*cdf0e10cSrcweir+#define __inline static __inline__ 1355*cdf0e10cSrcweir+#endif 1356*cdf0e10cSrcweir+ 1357*cdf0e10cSrcweir #ifdef __cplusplus 1358*cdf0e10cSrcweir extern "C"{ 1359*cdf0e10cSrcweir #endif 1360*cdf0e10cSrcweir@@ -3868,6 +3879,10 @@ 1361*cdf0e10cSrcweir } 1362*cdf0e10cSrcweir #endif 1363*cdf0e10cSrcweir 1364*cdf0e10cSrcweir+#undef __in 1365*cdf0e10cSrcweir+#undef __out 1366*cdf0e10cSrcweir+#undef __inline 1367*cdf0e10cSrcweir+ 1368*cdf0e10cSrcweir #endif 1369*cdf0e10cSrcweir 1370*cdf0e10cSrcweir 1371*cdf0e10cSrcweir--- include/propidl.h.orig 2008-01-18 22:17:32.000000000 +0900 1372*cdf0e10cSrcweir+++ include/propidl.h 2010-02-27 14:11:52.213875000 +0900 1373*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1374*cdf0e10cSrcweir+#if __GNUC__ >=3 1375*cdf0e10cSrcweir+#pragma GCC system_header 1376*cdf0e10cSrcweir+#endif 1377*cdf0e10cSrcweir 1378*cdf0e10cSrcweir 1379*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1380*cdf0e10cSrcweir@@ -76,6 +79,14 @@ 1381*cdf0e10cSrcweir #include "objidl.h" 1382*cdf0e10cSrcweir #include "oaidl.h" 1383*cdf0e10cSrcweir 1384*cdf0e10cSrcweir+#define __in 1385*cdf0e10cSrcweir+#define __out 1386*cdf0e10cSrcweir+#ifdef __cplusplus 1387*cdf0e10cSrcweir+#define __inline inline 1388*cdf0e10cSrcweir+#else 1389*cdf0e10cSrcweir+#define __inline static __inline__ 1390*cdf0e10cSrcweir+#endif 1391*cdf0e10cSrcweir+ 1392*cdf0e10cSrcweir #ifdef __cplusplus 1393*cdf0e10cSrcweir extern "C"{ 1394*cdf0e10cSrcweir #endif 1395*cdf0e10cSrcweir@@ -143,6 +154,7 @@ 1396*cdf0e10cSrcweir CHAR *pElems; 1397*cdf0e10cSrcweir } CAC; 1398*cdf0e10cSrcweir 1399*cdf0e10cSrcweir+#if 0 1400*cdf0e10cSrcweir typedef struct tagCAUB 1401*cdf0e10cSrcweir { 1402*cdf0e10cSrcweir ULONG cElems; 1403*cdf0e10cSrcweir@@ -268,7 +280,9 @@ 1404*cdf0e10cSrcweir ULONG cElems; 1405*cdf0e10cSrcweir CLSID *pElems; 1406*cdf0e10cSrcweir } CACLSID; 1407*cdf0e10cSrcweir+#endif 1408*cdf0e10cSrcweir 1409*cdf0e10cSrcweir+#if 0 1410*cdf0e10cSrcweir #ifdef MIDL_PASS 1411*cdf0e10cSrcweir // This is the PROPVARIANT padding layout for marshaling. 1412*cdf0e10cSrcweir typedef BYTE PROPVAR_PAD1; 1413*cdf0e10cSrcweir@@ -385,6 +399,7 @@ 1414*cdf0e10cSrcweir #endif 1415*cdf0e10cSrcweir 1416*cdf0e10cSrcweir #endif /* _MSC_EXTENSIONS */ 1417*cdf0e10cSrcweir+#endif 1418*cdf0e10cSrcweir 1419*cdf0e10cSrcweir #ifdef MIDL_PASS 1420*cdf0e10cSrcweir // This is the LPPROPVARIANT definition for marshaling. 1421*cdf0e10cSrcweir@@ -509,6 +524,7 @@ 1422*cdf0e10cSrcweir 1423*cdf0e10cSrcweir #define PRSPEC_PROPID ( 1 ) 1424*cdf0e10cSrcweir 1425*cdf0e10cSrcweir+#if 0 1426*cdf0e10cSrcweir typedef struct tagPROPSPEC 1427*cdf0e10cSrcweir { 1428*cdf0e10cSrcweir ULONG ulKind; 1429*cdf0e10cSrcweir@@ -526,12 +542,14 @@ 1430*cdf0e10cSrcweir PROPID propid; 1431*cdf0e10cSrcweir VARTYPE vt; 1432*cdf0e10cSrcweir } STATPROPSTG; 1433*cdf0e10cSrcweir+#endif 1434*cdf0e10cSrcweir 1435*cdf0e10cSrcweir // Macros for parsing the OS Version of the Property Set Header 1436*cdf0e10cSrcweir #define PROPSETHDR_OSVER_KIND(dwOSVer) HIWORD( (dwOSVer) ) 1437*cdf0e10cSrcweir #define PROPSETHDR_OSVER_MAJOR(dwOSVer) LOBYTE(LOWORD( (dwOSVer) )) 1438*cdf0e10cSrcweir #define PROPSETHDR_OSVER_MINOR(dwOSVer) HIBYTE(LOWORD( (dwOSVer) )) 1439*cdf0e10cSrcweir #define PROPSETHDR_OSVERSION_UNKNOWN 0xFFFFFFFF 1440*cdf0e10cSrcweir+#if 0 1441*cdf0e10cSrcweir typedef struct tagSTATPROPSETSTG 1442*cdf0e10cSrcweir { 1443*cdf0e10cSrcweir FMTID fmtid; 1444*cdf0e10cSrcweir@@ -542,12 +560,14 @@ 1445*cdf0e10cSrcweir FILETIME atime; 1446*cdf0e10cSrcweir DWORD dwOSVersion; 1447*cdf0e10cSrcweir } STATPROPSETSTG; 1448*cdf0e10cSrcweir+#endif 1449*cdf0e10cSrcweir 1450*cdf0e10cSrcweir 1451*cdf0e10cSrcweir 1452*cdf0e10cSrcweir extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_c_ifspec; 1453*cdf0e10cSrcweir extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_s_ifspec; 1454*cdf0e10cSrcweir 1455*cdf0e10cSrcweir+#if 0 1456*cdf0e10cSrcweir #ifndef __IPropertyStorage_INTERFACE_DEFINED__ 1457*cdf0e10cSrcweir #define __IPropertyStorage_INTERFACE_DEFINED__ 1458*cdf0e10cSrcweir 1459*cdf0e10cSrcweir@@ -1119,7 +1139,6 @@ 1460*cdf0e10cSrcweir #endif /* C style interface */ 1461*cdf0e10cSrcweir 1462*cdf0e10cSrcweir 1463*cdf0e10cSrcweir- 1464*cdf0e10cSrcweir /* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_RemoteNext_Proxy( 1465*cdf0e10cSrcweir IEnumSTATPROPSETSTG * This, 1466*cdf0e10cSrcweir /* [in] */ ULONG celt, 1467*cdf0e10cSrcweir@@ -1136,6 +1155,7 @@ 1468*cdf0e10cSrcweir 1469*cdf0e10cSrcweir 1470*cdf0e10cSrcweir #endif /* __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__ */ 1471*cdf0e10cSrcweir+#endif 1472*cdf0e10cSrcweir 1473*cdf0e10cSrcweir 1474*cdf0e10cSrcweir /* interface __MIDL_itf_propidl_0000_0004 */ 1475*cdf0e10cSrcweir@@ -1268,6 +1287,10 @@ 1476*cdf0e10cSrcweir } 1477*cdf0e10cSrcweir #endif 1478*cdf0e10cSrcweir 1479*cdf0e10cSrcweir+#undef __in 1480*cdf0e10cSrcweir+#undef __out 1481*cdf0e10cSrcweir+#undef __inline 1482*cdf0e10cSrcweir+ 1483*cdf0e10cSrcweir #endif 1484*cdf0e10cSrcweir 1485*cdf0e10cSrcweir 1486*cdf0e10cSrcweir--- include/propkeydef.h.orig 2008-01-18 22:17:32.000000000 +0900 1487*cdf0e10cSrcweir+++ include/propkeydef.h 2009-08-21 09:21:56.000000000 +0900 1488*cdf0e10cSrcweir@@ -2,6 +2,10 @@ 1489*cdf0e10cSrcweir #define PID_FIRST_USABLE 2 1490*cdf0e10cSrcweir #endif 1491*cdf0e10cSrcweir 1492*cdf0e10cSrcweir+#ifndef __MIDL_CONST 1493*cdf0e10cSrcweir+#define __MIDL_CONST const 1494*cdf0e10cSrcweir+#endif 1495*cdf0e10cSrcweir+ 1496*cdf0e10cSrcweir #ifndef REFPROPERTYKEY 1497*cdf0e10cSrcweir #ifdef __cplusplus 1498*cdf0e10cSrcweir #define REFPROPERTYKEY const PROPERTYKEY & 1499*cdf0e10cSrcweir--- include/propsys.h.orig 2008-01-18 22:17:34.000000000 +0900 1500*cdf0e10cSrcweir+++ include/propsys.h 2009-08-21 09:21:56.000000000 +0900 1501*cdf0e10cSrcweir@@ -228,6 +228,14 @@ 1502*cdf0e10cSrcweir #endif // 0 1503*cdf0e10cSrcweir #include <propkeydef.h> 1504*cdf0e10cSrcweir 1505*cdf0e10cSrcweir+#define __in 1506*cdf0e10cSrcweir+#define __out 1507*cdf0e10cSrcweir+#ifdef __cplusplus 1508*cdf0e10cSrcweir+#define __inline inline 1509*cdf0e10cSrcweir+#else 1510*cdf0e10cSrcweir+#define __inline static __inline__ 1511*cdf0e10cSrcweir+#endif 1512*cdf0e10cSrcweir+ 1513*cdf0e10cSrcweir 1514*cdf0e10cSrcweir extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_c_ifspec; 1515*cdf0e10cSrcweir extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_s_ifspec; 1516*cdf0e10cSrcweir@@ -3600,6 +3608,10 @@ 1517*cdf0e10cSrcweir } 1518*cdf0e10cSrcweir #endif 1519*cdf0e10cSrcweir 1520*cdf0e10cSrcweir+#undef __in 1521*cdf0e10cSrcweir+#undef __out 1522*cdf0e10cSrcweir+#undef __inline 1523*cdf0e10cSrcweir+ 1524*cdf0e10cSrcweir #endif 1525*cdf0e10cSrcweir 1526*cdf0e10cSrcweir 1527*cdf0e10cSrcweir--- include/propvarutil.h.orig 2008-01-18 22:17:34.000000000 +0900 1528*cdf0e10cSrcweir+++ include/propvarutil.h 2010-02-26 19:34:40.863625000 +0900 1529*cdf0e10cSrcweir@@ -14,6 +14,14 @@ 1530*cdf0e10cSrcweir #include <shtypes.h> 1531*cdf0e10cSrcweir #include <shlwapi.h> 1532*cdf0e10cSrcweir 1533*cdf0e10cSrcweir+#define __in 1534*cdf0e10cSrcweir+#define __out 1535*cdf0e10cSrcweir+#ifdef __cplusplus 1536*cdf0e10cSrcweir+#define __inline inline 1537*cdf0e10cSrcweir+#else 1538*cdf0e10cSrcweir+#define __inline static __inline__ 1539*cdf0e10cSrcweir+#endif 1540*cdf0e10cSrcweir+ 1541*cdf0e10cSrcweir #ifndef PSSTDAPI 1542*cdf0e10cSrcweir #if defined(_PROPSYS_) 1543*cdf0e10cSrcweir #define PSSTDAPI STDAPI 1544*cdf0e10cSrcweir--- include/shlobj.h.orig 2008-01-18 22:17:36.000000000 +0900 1545*cdf0e10cSrcweir+++ include/shlobj.h 2009-08-21 09:21:56.000000000 +0900 1546*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1547*cdf0e10cSrcweir+#if __GNUC__ >=3 1548*cdf0e10cSrcweir+#pragma GCC system_header 1549*cdf0e10cSrcweir+#endif 1550*cdf0e10cSrcweir /*=========================================================================== 1551*cdf0e10cSrcweir 1552*cdf0e10cSrcweir Copyright (c) Microsoft Corporation. All rights reserved. 1553*cdf0e10cSrcweir@@ -103,6 +106,14 @@ 1554*cdf0e10cSrcweir #include <shtypes.h> 1555*cdf0e10cSrcweir #include <shobjidl.h> 1556*cdf0e10cSrcweir 1557*cdf0e10cSrcweir+#define __in 1558*cdf0e10cSrcweir+#define __out 1559*cdf0e10cSrcweir+#ifdef __cplusplus 1560*cdf0e10cSrcweir+#define __inline inline 1561*cdf0e10cSrcweir+#else 1562*cdf0e10cSrcweir+#define __inline static __inline__ 1563*cdf0e10cSrcweir+#endif 1564*cdf0e10cSrcweir+ 1565*cdf0e10cSrcweir #if defined(_MSC_VER) && (_MSC_VER >= 1200) 1566*cdf0e10cSrcweir #pragma once 1567*cdf0e10cSrcweir #endif 1568*cdf0e10cSrcweir@@ -3117,7 +3128,7 @@ 1569*cdf0e10cSrcweir SHSTDAPI_(BOOL) ILIsEqual(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2); 1570*cdf0e10cSrcweir SHSTDAPI_(BOOL) ILIsParent(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2, BOOL fImmediate); 1571*cdf0e10cSrcweir SHSTDAPI ILSaveToStream(__in IStream *pstm, __in PCUIDLIST_RELATIVE pidl); 1572*cdf0e10cSrcweir-DECLSPEC_DEPRECATED SHSTDAPI ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl); 1573*cdf0e10cSrcweir+SHSTDAPI ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl); 1574*cdf0e10cSrcweir SHSTDAPI ILLoadFromStreamEx(__in IStream *pstm, __deref_out PIDLIST_RELATIVE *pidl); 1575*cdf0e10cSrcweir 1576*cdf0e10cSrcweir #if (_WIN32_IE >= 0x0400) 1577*cdf0e10cSrcweir@@ -4578,5 +4589,9 @@ 1578*cdf0e10cSrcweir #endif 1579*cdf0e10cSrcweir #endif 1580*cdf0e10cSrcweir 1581*cdf0e10cSrcweir+#undef __in 1582*cdf0e10cSrcweir+#undef __out 1583*cdf0e10cSrcweir+#undef __inline 1584*cdf0e10cSrcweir+ 1585*cdf0e10cSrcweir #endif /* _SHLOBJ_H_ */ 1586*cdf0e10cSrcweir 1587*cdf0e10cSrcweir--- include/shobjidl.h.orig 2008-01-18 22:17:36.000000000 +0900 1588*cdf0e10cSrcweir+++ include/shobjidl.h 2009-08-21 09:21:56.000000000 +0900 1589*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1590*cdf0e10cSrcweir+#if __GNUC__ >=3 1591*cdf0e10cSrcweir+#pragma GCC system_header 1592*cdf0e10cSrcweir+#endif 1593*cdf0e10cSrcweir 1594*cdf0e10cSrcweir 1595*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1596*cdf0e10cSrcweir@@ -1667,6 +1670,14 @@ 1597*cdf0e10cSrcweir #include "prsht.h" 1598*cdf0e10cSrcweir #include "propsys.h" 1599*cdf0e10cSrcweir 1600*cdf0e10cSrcweir+#define __in 1601*cdf0e10cSrcweir+#define __out 1602*cdf0e10cSrcweir+#ifdef __cplusplus 1603*cdf0e10cSrcweir+#define __inline inline 1604*cdf0e10cSrcweir+#else 1605*cdf0e10cSrcweir+#define __inline static __inline__ 1606*cdf0e10cSrcweir+#endif 1607*cdf0e10cSrcweir+ 1608*cdf0e10cSrcweir #ifdef __cplusplus 1609*cdf0e10cSrcweir extern "C"{ 1610*cdf0e10cSrcweir #endif 1611*cdf0e10cSrcweir@@ -6384,7 +6395,6 @@ 1612*cdf0e10cSrcweir 1613*cdf0e10cSrcweir typedef ICommDlgBrowser2 *LPCOMMDLGBROWSER2; 1614*cdf0e10cSrcweir 1615*cdf0e10cSrcweir-#endif // NTDDI_WIN2K 1616*cdf0e10cSrcweir #if (_WIN32_IE >= _WIN32_IE_IE70) 1617*cdf0e10cSrcweir 1618*cdf0e10cSrcweir 1619*cdf0e10cSrcweir@@ -6727,6 +6737,7 @@ 1620*cdf0e10cSrcweir /* [local] */ 1621*cdf0e10cSrcweir 1622*cdf0e10cSrcweir #endif // (_WIN32_IE >= _WIN32_IE_IE70) 1623*cdf0e10cSrcweir+#endif // NTDDI_WIN2K 1624*cdf0e10cSrcweir 1625*cdf0e10cSrcweir 1626*cdf0e10cSrcweir extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0026_v0_0_c_ifspec; 1627*cdf0e10cSrcweir@@ -7331,6 +7342,13 @@ 1628*cdf0e10cSrcweir typedef LPTBBUTTON LPTBBUTTONSB; 1629*cdf0e10cSrcweir #endif //_NEVER_ 1630*cdf0e10cSrcweir 1631*cdf0e10cSrcweir+#define __in 1632*cdf0e10cSrcweir+#define __out 1633*cdf0e10cSrcweir+#ifdef __cplusplus 1634*cdf0e10cSrcweir+#define __inline inline 1635*cdf0e10cSrcweir+#else 1636*cdf0e10cSrcweir+#define __inline static __inline__ 1637*cdf0e10cSrcweir+#endif 1638*cdf0e10cSrcweir 1639*cdf0e10cSrcweir extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_c_ifspec; 1640*cdf0e10cSrcweir extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_s_ifspec; 1641*cdf0e10cSrcweir@@ -29000,6 +29018,10 @@ 1642*cdf0e10cSrcweir } 1643*cdf0e10cSrcweir #endif 1644*cdf0e10cSrcweir 1645*cdf0e10cSrcweir+#undef __in 1646*cdf0e10cSrcweir+#undef __out 1647*cdf0e10cSrcweir+#undef __inline 1648*cdf0e10cSrcweir+ 1649*cdf0e10cSrcweir #endif 1650*cdf0e10cSrcweir 1651*cdf0e10cSrcweir 1652*cdf0e10cSrcweir--- include/shtypes.h.orig 2008-01-18 22:17:36.000000000 +0900 1653*cdf0e10cSrcweir+++ include/shtypes.h 2009-08-21 09:21:56.000000000 +0900 1654*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1655*cdf0e10cSrcweir+#if __GNUC__ >=3 1656*cdf0e10cSrcweir+#pragma GCC system_header 1657*cdf0e10cSrcweir+#endif 1658*cdf0e10cSrcweir 1659*cdf0e10cSrcweir 1660*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1661*cdf0e10cSrcweir@@ -137,7 +140,7 @@ 1662*cdf0e10cSrcweir 1663*cdf0e10cSrcweir #endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus) 1664*cdf0e10cSrcweir #include <poppack.h> 1665*cdf0e10cSrcweir-typedef /* [unique] */ __RPC_unique_pointer BYTE_BLOB *wirePIDL; 1666*cdf0e10cSrcweir+//typedef /* [unique] */ __RPC_unique_pointer BYTE_BLOB *wirePIDL; 1667*cdf0e10cSrcweir 1668*cdf0e10cSrcweir typedef /* [wire_marshal] */ ITEMIDLIST __unaligned *LPITEMIDLIST; 1669*cdf0e10cSrcweir 1670*cdf0e10cSrcweir--- include/sspi.h.orig 2008-01-18 22:17:38.000000000 +0900 1671*cdf0e10cSrcweir+++ include/sspi.h 2009-08-21 09:21:56.000000000 +0900 1672*cdf0e10cSrcweir@@ -20,6 +20,14 @@ 1673*cdf0e10cSrcweir #define __SSPI_H__ 1674*cdf0e10cSrcweir // end_ntifs 1675*cdf0e10cSrcweir 1676*cdf0e10cSrcweir+#define __in 1677*cdf0e10cSrcweir+#define __out 1678*cdf0e10cSrcweir+#ifdef __cplusplus 1679*cdf0e10cSrcweir+#define __inline inline 1680*cdf0e10cSrcweir+#else 1681*cdf0e10cSrcweir+#define __inline static __inline__ 1682*cdf0e10cSrcweir+#endif 1683*cdf0e10cSrcweir+ 1684*cdf0e10cSrcweir #if _MSC_VER > 1000 1685*cdf0e10cSrcweir #pragma once 1686*cdf0e10cSrcweir #endif 1687*cdf0e10cSrcweir@@ -2154,8 +2162,7 @@ 1688*cdf0e10cSrcweir 1689*cdf0e10cSrcweir // begin_ntifs 1690*cdf0e10cSrcweir 1691*cdf0e10cSrcweir-#ifndef _AUTH_IDENTITY_DEFINED 1692*cdf0e10cSrcweir-#define _AUTH_IDENTITY_DEFINED 1693*cdf0e10cSrcweir+#ifndef SEC_WINNT_AUTH_IDENTITY_ANSI 1694*cdf0e10cSrcweir 1695*cdf0e10cSrcweir // 1696*cdf0e10cSrcweir // This was not defined in NTIFS.h for windows 2000 however 1697*cdf0e10cSrcweir@@ -2326,6 +2333,10 @@ 1698*cdf0e10cSrcweir } // extern "C" 1699*cdf0e10cSrcweir #endif 1700*cdf0e10cSrcweir 1701*cdf0e10cSrcweir+#undef __in 1702*cdf0e10cSrcweir+#undef __out 1703*cdf0e10cSrcweir+#undef __inline 1704*cdf0e10cSrcweir+ 1705*cdf0e10cSrcweir // begin_ntifs 1706*cdf0e10cSrcweir #endif // __SSPI_H__ 1707*cdf0e10cSrcweir // end_ntifs 1708*cdf0e10cSrcweir--- include/strmif.h.orig 2008-01-18 22:17:38.000000000 +0900 1709*cdf0e10cSrcweir+++ include/strmif.h 2009-02-16 21:34:39.065125000 +0900 1710*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1711*cdf0e10cSrcweir+#if __GNUC__ >=3 1712*cdf0e10cSrcweir+#pragma GCC system_header 1713*cdf0e10cSrcweir+#endif 1714*cdf0e10cSrcweir 1715*cdf0e10cSrcweir 1716*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1717*cdf0e10cSrcweir@@ -888,6 +891,14 @@ 1718*cdf0e10cSrcweir #include "oaidl.h" 1719*cdf0e10cSrcweir #include "ocidl.h" 1720*cdf0e10cSrcweir 1721*cdf0e10cSrcweir+#define __in 1722*cdf0e10cSrcweir+#define __out 1723*cdf0e10cSrcweir+#ifdef __cplusplus 1724*cdf0e10cSrcweir+#define __inline inline 1725*cdf0e10cSrcweir+#else 1726*cdf0e10cSrcweir+#define __inline static __inline__ 1727*cdf0e10cSrcweir+#endif 1728*cdf0e10cSrcweir+ 1729*cdf0e10cSrcweir #ifdef __cplusplus 1730*cdf0e10cSrcweir extern "C"{ 1731*cdf0e10cSrcweir #endif 1732*cdf0e10cSrcweir@@ -16250,7 +16261,7 @@ 1733*cdf0e10cSrcweir #define _IAMFilterGraphCallback_ 1734*cdf0e10cSrcweir // Note: Because this interface was not defined as a proper interface it is 1735*cdf0e10cSrcweir // supported under C++ only. Methods aren't stdcall. 1736*cdf0e10cSrcweir-EXTERN_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70); 1737*cdf0e10cSrcweir+DEFINE_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70); 1738*cdf0e10cSrcweir interface IAMFilterGraphCallback : public IUnknown 1739*cdf0e10cSrcweir { 1740*cdf0e10cSrcweir // S_OK means rendering complete, S_FALSE means retry now. 1741*cdf0e10cSrcweir@@ -21934,7 +21945,7 @@ 1742*cdf0e10cSrcweir typedef struct tagVMRGUID 1743*cdf0e10cSrcweir { 1744*cdf0e10cSrcweir GUID *pGUID; 1745*cdf0e10cSrcweir- GUID GUID; 1746*cdf0e10cSrcweir+ GUID aGUID; 1747*cdf0e10cSrcweir } VMRGUID; 1748*cdf0e10cSrcweir 1749*cdf0e10cSrcweir typedef struct tagVMRMONITORINFO 1750*cdf0e10cSrcweir@@ -23341,6 +23352,10 @@ 1751*cdf0e10cSrcweir } 1752*cdf0e10cSrcweir #endif 1753*cdf0e10cSrcweir 1754*cdf0e10cSrcweir+#undef __in 1755*cdf0e10cSrcweir+#undef __out 1756*cdf0e10cSrcweir+#undef __inline 1757*cdf0e10cSrcweir+ 1758*cdf0e10cSrcweir #endif 1759*cdf0e10cSrcweir 1760*cdf0e10cSrcweir 1761*cdf0e10cSrcweir--- include/strsafe.h.orig 2008-01-18 22:17:38.000000000 +0900 1762*cdf0e10cSrcweir+++ include/strsafe.h 2009-02-16 21:34:39.065125000 +0900 1763*cdf0e10cSrcweir@@ -13,12 +13,23 @@ 1764*cdf0e10cSrcweir #if (_MSC_VER > 1000) 1765*cdf0e10cSrcweir #pragma once 1766*cdf0e10cSrcweir #endif 1767*cdf0e10cSrcweir+#if __GNUC__ >=3 1768*cdf0e10cSrcweir+#pragma GCC system_header 1769*cdf0e10cSrcweir+#endif 1770*cdf0e10cSrcweir 1771*cdf0e10cSrcweir #include <stdio.h> // for _vsnprintf, _vsnwprintf, getc, getwc 1772*cdf0e10cSrcweir #include <string.h> // for memset 1773*cdf0e10cSrcweir #include <stdarg.h> // for va_start, etc. 1774*cdf0e10cSrcweir #include <specstrings.h> // for __in, etc. 1775*cdf0e10cSrcweir 1776*cdf0e10cSrcweir+#define __in 1777*cdf0e10cSrcweir+#define __out 1778*cdf0e10cSrcweir+#ifdef __cplusplus 1779*cdf0e10cSrcweir+#define __inline inline 1780*cdf0e10cSrcweir+#else 1781*cdf0e10cSrcweir+#define __inline static __inline__ 1782*cdf0e10cSrcweir+#endif 1783*cdf0e10cSrcweir+ 1784*cdf0e10cSrcweir #if !defined(_W64) 1785*cdf0e10cSrcweir #if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && (_MSC_VER >= 1300) 1786*cdf0e10cSrcweir #define _W64 __w64 1787*cdf0e10cSrcweir@@ -9254,7 +9265,7 @@ 1788*cdf0e10cSrcweir wchar_t ch = getwc(stdin); 1789*cdf0e10cSrcweir // ASSERT(sizeof(wchar_t) == sizeof(wint_t)); 1790*cdf0e10cSrcweir 1791*cdf0e10cSrcweir- if (ch == WEOF) 1792*cdf0e10cSrcweir+ if (ch == 0xffff) 1793*cdf0e10cSrcweir { 1794*cdf0e10cSrcweir if (cchNewDestLength == 0) 1795*cdf0e10cSrcweir { 1796*cdf0e10cSrcweir@@ -9763,5 +9774,9 @@ 1797*cdf0e10cSrcweir 1798*cdf0e10cSrcweir #pragma warning(pop) 1799*cdf0e10cSrcweir 1800*cdf0e10cSrcweir+#undef __in 1801*cdf0e10cSrcweir+#undef __out 1802*cdf0e10cSrcweir+#undef __inline 1803*cdf0e10cSrcweir+ 1804*cdf0e10cSrcweir #endif // _STRSAFE_H_INCLUDED_ 1805*cdf0e10cSrcweir 1806*cdf0e10cSrcweir--- include/structuredquery.h.orig 2008-01-18 22:17:38.000000000 +0900 1807*cdf0e10cSrcweir+++ include/structuredquery.h 2009-08-21 09:21:56.000000000 +0900 1808*cdf0e10cSrcweir@@ -233,6 +233,14 @@ 1809*cdf0e10cSrcweir #include "ocidl.h" 1810*cdf0e10cSrcweir #include "propidl.h" 1811*cdf0e10cSrcweir 1812*cdf0e10cSrcweir+#define __in 1813*cdf0e10cSrcweir+#define __out 1814*cdf0e10cSrcweir+#ifdef __cplusplus 1815*cdf0e10cSrcweir+#define __inline inline 1816*cdf0e10cSrcweir+#else 1817*cdf0e10cSrcweir+#define __inline static __inline__ 1818*cdf0e10cSrcweir+#endif 1819*cdf0e10cSrcweir+ 1820*cdf0e10cSrcweir #ifdef __cplusplus 1821*cdf0e10cSrcweir extern "C"{ 1822*cdf0e10cSrcweir #endif 1823*cdf0e10cSrcweir@@ -2472,6 +2480,10 @@ 1824*cdf0e10cSrcweir } 1825*cdf0e10cSrcweir #endif 1826*cdf0e10cSrcweir 1827*cdf0e10cSrcweir+#undef __in 1828*cdf0e10cSrcweir+#undef __out 1829*cdf0e10cSrcweir+#undef __inline 1830*cdf0e10cSrcweir+ 1831*cdf0e10cSrcweir #endif 1832*cdf0e10cSrcweir 1833*cdf0e10cSrcweir 1834*cdf0e10cSrcweir--- include/urlmon.h.orig 2008-01-18 22:17:40.000000000 +0900 1835*cdf0e10cSrcweir+++ include/urlmon.h 2009-08-21 09:21:56.000000000 +0900 1836*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 1837*cdf0e10cSrcweir+#if __GNUC__ >=3 1838*cdf0e10cSrcweir+#pragma GCC system_header 1839*cdf0e10cSrcweir+#endif 1840*cdf0e10cSrcweir 1841*cdf0e10cSrcweir 1842*cdf0e10cSrcweir /* this ALWAYS GENERATED file contains the definitions for the interfaces */ 1843*cdf0e10cSrcweir@@ -330,6 +333,14 @@ 1844*cdf0e10cSrcweir #include "servprov.h" 1845*cdf0e10cSrcweir #include "msxml.h" 1846*cdf0e10cSrcweir 1847*cdf0e10cSrcweir+#define __in 1848*cdf0e10cSrcweir+#define __out 1849*cdf0e10cSrcweir+#ifdef __cplusplus 1850*cdf0e10cSrcweir+#define __inline inline 1851*cdf0e10cSrcweir+#else 1852*cdf0e10cSrcweir+#define __inline static __inline__ 1853*cdf0e10cSrcweir+#endif 1854*cdf0e10cSrcweir+ 1855*cdf0e10cSrcweir #ifdef __cplusplus 1856*cdf0e10cSrcweir extern "C"{ 1857*cdf0e10cSrcweir #endif 1858*cdf0e10cSrcweir@@ -8880,6 +8891,10 @@ 1859*cdf0e10cSrcweir } 1860*cdf0e10cSrcweir #endif 1861*cdf0e10cSrcweir 1862*cdf0e10cSrcweir+#undef __in 1863*cdf0e10cSrcweir+#undef __out 1864*cdf0e10cSrcweir+#undef __inline 1865*cdf0e10cSrcweir+ 1866*cdf0e10cSrcweir #endif 1867*cdf0e10cSrcweir 1868*cdf0e10cSrcweir 1869*cdf0e10cSrcweir--- include/wincrypt.h.orig 2008-01-18 22:17:42.000000000 +0900 1870*cdf0e10cSrcweir+++ include/wincrypt.h 2009-02-16 21:34:39.065125000 +0900 1871*cdf0e10cSrcweir@@ -14,6 +14,14 @@ 1872*cdf0e10cSrcweir 1873*cdf0e10cSrcweir #include <specstrings.h> /* for SAL annotations */ 1874*cdf0e10cSrcweir 1875*cdf0e10cSrcweir+#define __in 1876*cdf0e10cSrcweir+#define __out 1877*cdf0e10cSrcweir+#ifdef __cplusplus 1878*cdf0e10cSrcweir+#define __inline inline 1879*cdf0e10cSrcweir+#else 1880*cdf0e10cSrcweir+#define __inline static __inline__ 1881*cdf0e10cSrcweir+#endif 1882*cdf0e10cSrcweir+ 1883*cdf0e10cSrcweir #if defined (_MSC_VER) 1884*cdf0e10cSrcweir 1885*cdf0e10cSrcweir #if ( _MSC_VER >= 800 ) 1886*cdf0e10cSrcweir@@ -1927,6 +1935,14 @@ 1887*cdf0e10cSrcweir #include <bcrypt.h> 1888*cdf0e10cSrcweir #include <ncrypt.h> 1889*cdf0e10cSrcweir 1890*cdf0e10cSrcweir+#define __in 1891*cdf0e10cSrcweir+#define __out 1892*cdf0e10cSrcweir+#ifdef __cplusplus 1893*cdf0e10cSrcweir+#define __inline inline 1894*cdf0e10cSrcweir+#else 1895*cdf0e10cSrcweir+#define __inline static __inline__ 1896*cdf0e10cSrcweir+#endif 1897*cdf0e10cSrcweir+ 1898*cdf0e10cSrcweir // This type is used when the API can take either the CAPI1 HCRYPTPROV or 1899*cdf0e10cSrcweir // the CNG NCRYPT_KEY_HANDLE. Where appropriate, the HCRYPTPROV will be 1900*cdf0e10cSrcweir // converted to a NCRYPT_KEY_HANDLE via the CNG NCryptTranslateHandle(). 1901*cdf0e10cSrcweir@@ -17113,8 +17129,8 @@ 1902*cdf0e10cSrcweir __in DWORD dwFlags, 1903*cdf0e10cSrcweir __in_opt PCRYPT_KEY_PROV_INFO pKeyProvInfo, 1904*cdf0e10cSrcweir __in_opt PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, 1905*cdf0e10cSrcweir- __in_opt PSYSTEMTIME pStartTime, 1906*cdf0e10cSrcweir- __in_opt PSYSTEMTIME pEndTime, 1907*cdf0e10cSrcweir+ __in_opt LPSYSTEMTIME pStartTime, 1908*cdf0e10cSrcweir+ __in_opt LPSYSTEMTIME pEndTime, 1909*cdf0e10cSrcweir __in_opt PCERT_EXTENSIONS pExtensions 1910*cdf0e10cSrcweir ); 1911*cdf0e10cSrcweir 1912*cdf0e10cSrcweir@@ -19174,6 +19190,10 @@ 1913*cdf0e10cSrcweir #endif 1914*cdf0e10cSrcweir #endif 1915*cdf0e10cSrcweir 1916*cdf0e10cSrcweir+#undef __in 1917*cdf0e10cSrcweir+#undef __out 1918*cdf0e10cSrcweir+#undef __inline 1919*cdf0e10cSrcweir+ 1920*cdf0e10cSrcweir #endif // __WINCRYPT_H__ 1921*cdf0e10cSrcweir 1922*cdf0e10cSrcweir 1923*cdf0e10cSrcweir--- include/winerror.h.orig 2008-01-18 22:17:42.000000000 +0900 1924*cdf0e10cSrcweir+++ include/winerror.h 2009-08-21 09:21:56.000000000 +0900 1925*cdf0e10cSrcweir@@ -23,6 +23,11 @@ 1926*cdf0e10cSrcweir 1927*cdf0e10cSrcweir #include <specstrings.h> 1928*cdf0e10cSrcweir 1929*cdf0e10cSrcweir+#ifdef __cplusplus 1930*cdf0e10cSrcweir+#define __inline inline 1931*cdf0e10cSrcweir+#else 1932*cdf0e10cSrcweir+#define __inline static __inline__ 1933*cdf0e10cSrcweir+#endif 1934*cdf0e10cSrcweir // 1935*cdf0e10cSrcweir // Values are 32 bit values laid out as follows: 1936*cdf0e10cSrcweir // 1937*cdf0e10cSrcweir--- include/wingdi.h.orig 2008-01-18 22:17:42.000000000 +0900 1938*cdf0e10cSrcweir+++ include/wingdi.h 2009-08-21 09:21:56.000000000 +0900 1939*cdf0e10cSrcweir@@ -9,6 +9,13 @@ 1940*cdf0e10cSrcweir #ifndef _WINGDI_ 1941*cdf0e10cSrcweir #define _WINGDI_ 1942*cdf0e10cSrcweir 1943*cdf0e10cSrcweir+#define __in 1944*cdf0e10cSrcweir+#define __out 1945*cdf0e10cSrcweir+#ifdef __cplusplus 1946*cdf0e10cSrcweir+#define __inline inline 1947*cdf0e10cSrcweir+#else 1948*cdf0e10cSrcweir+#define __inline static __inline__ 1949*cdf0e10cSrcweir+#endif 1950*cdf0e10cSrcweir 1951*cdf0e10cSrcweir #pragma once 1952*cdf0e10cSrcweir 1953*cdf0e10cSrcweir@@ -1901,7 +1908,7 @@ 1954*cdf0e10cSrcweir /* size of a form name string */ 1955*cdf0e10cSrcweir #define CCHFORMNAME 32 1956*cdf0e10cSrcweir 1957*cdf0e10cSrcweir-#if (_WIN32_WINNT >= ((OSVER(NTDDI_WINXPSP2)) >> 16)) 1958*cdf0e10cSrcweir+#if (_WIN32_WINNT >= ((NTDDI_WINXPSP2 & 0xFFFF0000) >> 16)) 1959*cdf0e10cSrcweir typedef struct _devicemodeA { 1960*cdf0e10cSrcweir BYTE dmDeviceName[CCHDEVICENAME]; 1961*cdf0e10cSrcweir WORD dmSpecVersion; 1962*cdf0e10cSrcweir@@ -5424,6 +5431,10 @@ 1963*cdf0e10cSrcweir } 1964*cdf0e10cSrcweir #endif 1965*cdf0e10cSrcweir 1966*cdf0e10cSrcweir+#undef __in 1967*cdf0e10cSrcweir+#undef __out 1968*cdf0e10cSrcweir+#undef __inline 1969*cdf0e10cSrcweir+ 1970*cdf0e10cSrcweir #endif /* _WINGDI_ */ 1971*cdf0e10cSrcweir 1972*cdf0e10cSrcweir 1973*cdf0e10cSrcweir--- include/wintrust.h.orig 2008-01-18 22:17:42.000000000 +0900 1974*cdf0e10cSrcweir+++ include/wintrust.h 2009-08-21 09:21:56.000000000 +0900 1975*cdf0e10cSrcweir@@ -1252,6 +1252,7 @@ 1976*cdf0e10cSrcweir // 1977*cdf0e10cSrcweir #ifdef WT_DEFINE_ALL_APIS 1978*cdf0e10cSrcweir 1979*cdf0e10cSrcweir+#if 0 1980*cdf0e10cSrcweir typedef struct _WIN_CERTIFICATE 1981*cdf0e10cSrcweir { 1982*cdf0e10cSrcweir DWORD dwLength; 1983*cdf0e10cSrcweir@@ -1260,6 +1261,7 @@ 1984*cdf0e10cSrcweir BYTE bCertificate[ANYSIZE_ARRAY]; 1985*cdf0e10cSrcweir 1986*cdf0e10cSrcweir } WIN_CERTIFICATE, *LPWIN_CERTIFICATE; 1987*cdf0e10cSrcweir+#endif 1988*cdf0e10cSrcweir 1989*cdf0e10cSrcweir #define WIN_CERT_REVISION_1_0 (0x0100) 1990*cdf0e10cSrcweir #define WIN_CERT_REVISION_2_0 (0x0200) 1991*cdf0e10cSrcweir--- include/winuser.h.orig 2008-01-18 22:17:44.000000000 +0900 1992*cdf0e10cSrcweir+++ include/winuser.h 2009-08-21 09:21:56.000000000 +0900 1993*cdf0e10cSrcweir@@ -11,6 +11,15 @@ 1994*cdf0e10cSrcweir #ifndef _WINUSER_ 1995*cdf0e10cSrcweir #define _WINUSER_ 1996*cdf0e10cSrcweir 1997*cdf0e10cSrcweir+#define __in 1998*cdf0e10cSrcweir+#define __out 1999*cdf0e10cSrcweir+#ifdef __cplusplus 2000*cdf0e10cSrcweir+#define __inline inline 2001*cdf0e10cSrcweir+#else 2002*cdf0e10cSrcweir+#define __inline static __inline__ 2003*cdf0e10cSrcweir+#endif 2004*cdf0e10cSrcweir+DECLARE_HANDLE(HHOOK); 2005*cdf0e10cSrcweir+typedef CONST GUID *LPCGUID; 2006*cdf0e10cSrcweir 2007*cdf0e10cSrcweir 2008*cdf0e10cSrcweir #pragma once 2009*cdf0e10cSrcweir@@ -39,7 +48,7 @@ 2010*cdf0e10cSrcweir #define WINVER 0x0500 /* version 5.0 */ 2011*cdf0e10cSrcweir #endif /* !WINVER */ 2012*cdf0e10cSrcweir 2013*cdf0e10cSrcweir-#include <stdarg.h> 2014*cdf0e10cSrcweir+#include <../include/stdarg.h> 2015*cdf0e10cSrcweir 2016*cdf0e10cSrcweir #ifndef NOUSER 2017*cdf0e10cSrcweir 2018*cdf0e10cSrcweir@@ -10717,7 +10726,7 @@ 2019*cdf0e10cSrcweir #define CDS_RESET 0x40000000 2020*cdf0e10cSrcweir #define CDS_NORESET 0x10000000 2021*cdf0e10cSrcweir 2022*cdf0e10cSrcweir-#include <tvout.h> 2023*cdf0e10cSrcweir+//#include <tvout.h> 2024*cdf0e10cSrcweir 2025*cdf0e10cSrcweir /* Return values for ChangeDisplaySettings */ 2026*cdf0e10cSrcweir #define DISP_CHANGE_SUCCESSFUL 0 2027*cdf0e10cSrcweir@@ -12571,16 +12580,20 @@ 2028*cdf0e10cSrcweir 2029*cdf0e10cSrcweir 2030*cdf0e10cSrcweir 2031*cdf0e10cSrcweir-#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ 2032*cdf0e10cSrcweir-#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) 2033*cdf0e10cSrcweir-#include "winuser.inl" 2034*cdf0e10cSrcweir-#endif /* ISOLATION_AWARE_ENABLED */ 2035*cdf0e10cSrcweir-#endif /* RC */ 2036*cdf0e10cSrcweir+//#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ 2037*cdf0e10cSrcweir+//#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) 2038*cdf0e10cSrcweir+//#include "winuser.inl" 2039*cdf0e10cSrcweir+//#endif /* ISOLATION_AWARE_ENABLED */ 2040*cdf0e10cSrcweir+//#endif /* RC */ 2041*cdf0e10cSrcweir 2042*cdf0e10cSrcweir #ifdef __cplusplus 2043*cdf0e10cSrcweir } 2044*cdf0e10cSrcweir #endif /* __cplusplus */ 2045*cdf0e10cSrcweir 2046*cdf0e10cSrcweir+#undef __in 2047*cdf0e10cSrcweir+#undef __out 2048*cdf0e10cSrcweir+#undef __inline 2049*cdf0e10cSrcweir+ 2050*cdf0e10cSrcweir #endif /* !_WINUSER_ */ 2051*cdf0e10cSrcweir 2052*cdf0e10cSrcweir 2053*cdf0e10cSrcweir--- include/wspiapi.h.orig 2008-01-18 22:17:44.000000000 +0900 2054*cdf0e10cSrcweir+++ include/wspiapi.h 2009-08-21 09:21:56.000000000 +0900 2055*cdf0e10cSrcweir@@ -15,6 +15,9 @@ 2056*cdf0e10cSrcweir 2057*cdf0e10cSrcweir #ifndef _WSPIAPI_H_ 2058*cdf0e10cSrcweir #define _WSPIAPI_H_ 2059*cdf0e10cSrcweir+#if __GNUC__ >=3 2060*cdf0e10cSrcweir+#pragma GCC system_header 2061*cdf0e10cSrcweir+#endif 2062*cdf0e10cSrcweir 2063*cdf0e10cSrcweir #pragma once 2064*cdf0e10cSrcweir 2065*cdf0e10cSrcweir@@ -85,6 +88,11 @@ 2066*cdf0e10cSrcweir 2067*cdf0e10cSrcweir #ifdef __cplusplus 2068*cdf0e10cSrcweir extern "C" { 2069*cdf0e10cSrcweir+#define _inline inline 2070*cdf0e10cSrcweir+#define __inline inline 2071*cdf0e10cSrcweir+#else 2072*cdf0e10cSrcweir+#define _inline static __inline__ 2073*cdf0e10cSrcweir+#define __inline static __inline__ 2074*cdf0e10cSrcweir #endif 2075*cdf0e10cSrcweir 2076*cdf0e10cSrcweir //////////////////////////////////////////////////////////// 2077*cdf0e10cSrcweir@@ -1052,6 +1060,8 @@ 2078*cdf0e10cSrcweir (*pfFreeAddrInfo)(ai); 2079*cdf0e10cSrcweir } 2080*cdf0e10cSrcweir 2081*cdf0e10cSrcweir+#undef _inline 2082*cdf0e10cSrcweir+#undef __inline 2083*cdf0e10cSrcweir #ifdef __cplusplus 2084*cdf0e10cSrcweir } 2085*cdf0e10cSrcweir #endif 2086*cdf0e10cSrcweir--- include/d3dtypes.h.orig 2004-09-27 12:34:16.000000000 +0900 2087*cdf0e10cSrcweir+++ include/d3dtypes.h 2007-11-30 21:42:09.558750000 +0900 2088*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 2089*cdf0e10cSrcweir+#if __GNUC__ >=3 2090*cdf0e10cSrcweir+#pragma GCC system_header 2091*cdf0e10cSrcweir+#endif 2092*cdf0e10cSrcweir /*==========================================================================; 2093*cdf0e10cSrcweir * 2094*cdf0e10cSrcweir * Copyright (C) Microsoft Corporation. All Rights Reserved. 2095*cdf0e10cSrcweir--- include/d3dx9core.h.orig 2006-03-31 12:16:02.000000000 +0900 2096*cdf0e10cSrcweir+++ include/d3dx9core.h 2009-08-21 09:21:56.000000000 +0900 2097*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 2098*cdf0e10cSrcweir+#if __GNUC__ >=3 2099*cdf0e10cSrcweir+#pragma GCC system_header 2100*cdf0e10cSrcweir+#endif 2101*cdf0e10cSrcweir /////////////////////////////////////////////////////////////////////////// 2102*cdf0e10cSrcweir // 2103*cdf0e10cSrcweir // Copyright (C) Microsoft Corporation. All Rights Reserved. 2104*cdf0e10cSrcweir--- include/d3dx9math.h.orig 2005-07-22 17:00:18.000000000 +0900 2105*cdf0e10cSrcweir+++ include/d3dx9math.h 2009-08-21 09:21:56.000000000 +0900 2106*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 2107*cdf0e10cSrcweir+#if __GNUC__ >=3 2108*cdf0e10cSrcweir+#pragma GCC system_header 2109*cdf0e10cSrcweir+#endif 2110*cdf0e10cSrcweir ////////////////////////////////////////////////////////////////////////////// 2111*cdf0e10cSrcweir // 2112*cdf0e10cSrcweir // Copyright (C) Microsoft Corporation. All Rights Reserved. 2113*cdf0e10cSrcweir--- include/d3dx9math.inl.orig 2005-03-18 17:26:56.000000000 +0900 2114*cdf0e10cSrcweir+++ include/d3dx9math.inl 2009-08-21 09:21:56.000000000 +0900 2115*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 2116*cdf0e10cSrcweir+#if __GNUC__ >=3 2117*cdf0e10cSrcweir+#pragma GCC system_header 2118*cdf0e10cSrcweir+#endif 2119*cdf0e10cSrcweir ////////////////////////////////////////////////////////////////////////////// 2120*cdf0e10cSrcweir // 2121*cdf0e10cSrcweir // Copyright (C) Microsoft Corporation. All Rights Reserved. 2122*cdf0e10cSrcweir--- include/dxtrans.h.orig 2004-09-28 00:18:32.000000000 +0900 2123*cdf0e10cSrcweir+++ include/dxtrans.h 2007-01-02 22:08:41.640625000 +0900 2124*cdf0e10cSrcweir@@ -1,3 +1,6 @@ 2125*cdf0e10cSrcweir+#if __GNUC__ >=3 2126*cdf0e10cSrcweir+#pragma GCC system_header 2127*cdf0e10cSrcweir+#endif 2128*cdf0e10cSrcweir 2129*cdf0e10cSrcweir #pragma warning( disable: 4049 ) /* more than 64k source lines */ 2130*cdf0e10cSrcweir 2131