?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Create DEV300_m48 milestone tag from trunk@271829
[LibreOffice.git] / external / mingwheaders / mingw_headers.patch
blobfdb17a750c33664ac925d6b989726dc2875cbced
1 --- include/crtdbg.h.orig 2006-09-18 01:21:38.968750000 +0900
2 +++ include/crtdbg.h 2006-09-02 23:12:50.109375000 +0900
3 @@ -0,0 +1,11 @@
4 +#ifndef _CRTDBG_H
5 +#define _CRTDBG_H
6 +#if __GNUC__ >=3
7 +#pragma GCC system_header
8 +#endif
9 +
10 +#ifndef _ASSERTE
11 +#define _ASSERTE(expr) ((void)0)
12 +#endif
13 +
14 +#endif
15 --- include/winres.h.orig 2006-07-22 23:41:18.000000000 +0900
16 +++ include/winres.h 2006-07-22 23:41:18.000000000 +0900
17 @@ -0,0 +1,13 @@
18 +#ifndef _WINRES_H
19 +#define _WINRES_H
20 +#if __GNUC__ >=3
21 +#pragma GCC system_header
22 +#endif
23 +
24 +#define VS_VERSION_INFO 1
25 +#include <winresrc.h>
26 +#ifdef IDC_STATIC
27 +#undef IDC_STATIC
28 +#endif
29 +#define IDC_STATIC (-1)
30 +#endif
31 --- include/excpt.h.orig 2005-01-14 05:19:52.000000000 +0900
32 +++ include/excpt.h 2006-12-31 09:21:56.000000000 +0900
33 @@ -16,8 +16,11 @@
34
35 /* All the headers include this file. */
36 #include <_mingw.h>
37 +#include <setjmp.h>
38 +#include <stdarg.h>
39
40 #include <windef.h>
41 +#include <winbase.h>
42
43 /*
44 * NOTE: The constants structs and typedefs below should be defined in the
45 @@ -52,7 +55,7 @@
46 * The type of function that is expected as an exception handler to be
47 * installed with __try1.
48 */
49 -typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)
50 +typedef EXCEPTION_DISPOSITION (* PEXCEPTION_HANDLER)
51 (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
52
53 /*
54 @@ -93,8 +96,122 @@
55 __asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \
56 : : : "%eax");
57
58 +WINBASEAPI
59 +VOID
60 +WINAPI
61 +RtlUnwind (
62 + IN PVOID TargetFrame OPTIONAL,
63 + IN PVOID TargetIp OPTIONAL,
64 + IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL,
65 + IN PVOID ReturnValue
66 + );
67 #ifdef __cplusplus
68 }
69 +
70 +class __SEHandler
71 +{
72 + public:
73 + __SEHandler() {}
74 + ~__SEHandler() {}
75 + typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
76 + typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
77 + typedef void (*PN)(void *);
78 + void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
79 + {
80 + __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
81 + m_pData=pdata;
82 + switch (reinterpret_cast<int>(pfilter))
83 + {
84 + default:
85 + m_filter=pfilter;
86 + break;
87 + case EXCEPTION_CONTINUE_EXECUTION:
88 + m_filter=DefaultFilterContinueExecution;
89 + break;
90 + case EXCEPTION_EXECUTE_HANDLER:
91 + m_filter=DefaultFilterExecuteHandler;
92 + break;
93 + case EXCEPTION_CONTINUE_SEARCH:
94 + m_filter=DefaultFilterContinueSearch;
95 + break;
96 + }
97 + if (phandlerbody)
98 + m_handlerbody=phandlerbody;
99 + else
100 + m_handlerbody=DefaultHandler;
101 + if (pfinal)
102 + m_final=pfinal;
103 + else
104 + m_final=DefaultFinal;
105 + m_ER.pHandlerClass = this;
106 + m_ER.hp = handler;
107 + asm("movl %%fs:0, %%eax\n\t"
108 + "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
109 + asm("movl %0, %%eax\n\t"
110 + "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
111 + }
112 + void Reset()
113 + {
114 + m_final(m_pData);
115 + asm("movl %0, %%eax \n\t"
116 + "movl %%eax, %%fs:0"
117 + : : "m" (m_ER.prev): "%eax");
118 + }
119 + private:
120 + __SEHandler(const __SEHandler&);
121 + __SEHandler& operator=(const __SEHandler&);
122 + struct _ER {
123 + _ER* prev;
124 + PEXCEPTION_HANDLER hp;
125 + __SEHandler *pHandlerClass;
126 + };
127 + static EXCEPTION_DISPOSITION handler(
128 + struct _EXCEPTION_RECORD *pExceptionRecord,
129 + void * EstablisherFrame,
130 + struct _CONTEXT *ContextRecord,
131 + void * /*DispatcherContext*/)
132 + {
133 + __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
134 + if ( pExceptionRecord->ExceptionFlags & EH_UNWINDING )
135 + {
136 + pThis->m_final(pThis->m_pData);
137 + return ExceptionContinueSearch;
138 + }
139 + EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
140 + switch ( pThis->m_filter(pThis->m_pData, &ep) )
141 + {
142 + case EXCEPTION_EXECUTE_HANDLER:
143 + RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
144 +__set_label:
145 + pThis->m_handlerbody(pThis->m_pData, &ep);
146 + ContextRecord->Ebp = pThis->m_jmpbuf[0];
147 + ContextRecord->Eip = pThis->m_jmpbuf[1];
148 + ContextRecord->Esp = pThis->m_jmpbuf[2];
149 + return ExceptionContinueExecution;
150 + case EXCEPTION_CONTINUE_SEARCH:
151 + return ExceptionContinueSearch;
152 + case EXCEPTION_CONTINUE_EXECUTION:
153 + return ExceptionContinueExecution;
154 + }
155 + return ExceptionContinueExecution;
156 + }
157 + static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
158 + static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
159 + static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
160 + static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
161 + static void DefaultFinal(void *) {}
162 + typedef int (*handler_p)(
163 + struct _EXCEPTION_RECORD *ExceptionRecord,
164 + void * EstablisherFrame,
165 + struct _CONTEXT *ContextRecord,
166 + void * DispatcherContext);
167 + _ER m_ER;
168 + void *m_pData;
169 + PN m_final;
170 + PH m_handlerbody;
171 + PF m_filter;
172 + jmp_buf m_jmpbuf;
173 +};
174 #endif
175
176 #endif /* Not RC_INVOKED */
177 --- include/tchar.h.orig 2006-03-26 09:21:36.000000000 +0900
178 +++ include/tchar.h 2006-03-26 09:21:42.000000000 +0900
179 @@ -223,6 +223,9 @@
180 #define _ttelldir _wtelldir
181 #define _tseekdir _wseekdir
182
183 +#define _ttempnam _wtempnam
184 +
185 +
186 #else /* Not _UNICODE */
187
188 /*
189 @@ -407,6 +410,8 @@
190 #define _ttelldir telldir
191 #define _tseekdir seekdir
192
193 +#define _ttempnam _tempnam
194 +
195 #endif /* Not _UNICODE */
196
197 /*
198 --- include/amvideo.h.orig 2006-11-19 08:08:30.000000000 +0900
199 +++ include/amvideo.h 2007-01-16 23:11:24.656250000 +0900
200 @@ -52,10 +52,10 @@
201 BITMAPINFOHEADER bmiHeader;
202 } VIDEOINFOHEADER;
203 typedef struct tagVIDEOINFO {
204 - RECT rcSource,
205 - RECT rcTarget,
206 - DWORD dwBitRate,
207 - DWORD dwBitErrorRate,
208 + RECT rcSource;
209 + RECT rcTarget;
210 + DWORD dwBitRate;
211 + DWORD dwBitErrorRate;
212 REFERENCE_TIME AvgTimePerFrame;
213 BITMAPINFOHEADER bmiHeader;
214 union {
215 --- include/bdatypes.h.orig 2006-11-19 08:08:30.000000000 +0900
216 +++ include/bdatypes.h 2007-01-16 23:21:10.062500000 +0900
217 @@ -17,9 +17,9 @@
218 } MEDIA_SAMPLE_CONTENT;
219 /*--- DirectShow Reference - DirectShow Structures */
220 typedef struct {
221 - DWORD dwOffset
222 - DWORD dwPacketLength
223 - DWORD dwStride
224 + DWORD dwOffset;
225 + DWORD dwPacketLength;
226 + DWORD dwStride;
227 } MPEG2_TRANSPORT_STRIDE;
228 typedef struct {
229 ULONG ulPID;
230 --- include/imm.h.orig 2007-12-27 23:07:19.000000000 +0900
231 +++ include/imm.h 2008-11-08 07:28:48.983375000 +0900
232 @@ -105,6 +105,7 @@
233 #define UI_CAP_ROTANY 4
234 #define SCS_CAP_COMPSTR 1
235 #define SCS_CAP_MAKEREAD 2
236 +#define SCS_CAP_SETRECONVERTSTRING 4
237 #define SELECT_CAP_CONVERSION 1
238 #define SELECT_CAP_SENTENCE 2
239 #define GGL_LEVEL 1
240 @@ -208,6 +209,7 @@
241 #define IME_REGWORD_STYLE_USER_FIRST 0x80000000
242 #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF
243 #define IMR_RECONVERTSTRING 4
244 +#define IMR_CONFIRMRECONVERTSTRING 5
245 #define IMR_QUERYCHARPOSITION 6
246 #define SOFTKEYBOARD_TYPE_T1 1
247 #define SOFTKEYBOARD_TYPE_C1 2
248 @@ -285,7 +287,7 @@
249 DWORD dwCompStrOffset;
250 DWORD dwTargetStrLen;
251 DWORD dwTargetStrOffset;
252 -} RECONVERTSTRING, *PRECONVERTSTRING;
253 +} RECONVERTSTRING, *PRECONVERTSTRING, *LPRECONVERTSTRING;
254 typedef struct tagREGISTERWORDA {
255 LPSTR lpReading;
256 LPSTR lpWord;
257 --- include/oaidl.h.orig 2006-11-19 08:08:33.000000000 +0900
258 +++ include/oaidl.h 2007-01-20 09:08:24.625000000 +0900
259 @@ -78,6 +78,8 @@
260 typedef _COM_interface ICreateErrorInfo *LPCREATEERRORINFO;
261 typedef _COM_interface ISupportErrorInfo *LPSUPPORTERRORINFO;
262 typedef _COM_interface IRecordInfo *LPRECORDINFO;
263 +typedef _COM_interface IErrorLog *LPERRORLOG;
264 +typedef _COM_interface IPropertyBag *LPPROPERTYBAG;
265
266 extern const IID IID_ITypeLib;
267 extern const IID IID_ITypeLib2;
268 @@ -772,6 +774,29 @@
269 };
270 #undef INTERFACE
271
272 +EXTERN_C const IID IID_IErrorLog;
273 +#define INTERFACE IErrorLog
274 +DECLARE_INTERFACE_(IErrorLog,IUnknown)
275 +{
276 + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
277 + STDMETHOD_(ULONG,AddRef)(THIS) PURE;
278 + STDMETHOD_(ULONG,Release)(THIS) PURE;
279 + STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE;
280 +};
281 +#undef INTERFACE
282 +
283 +EXTERN_C const IID IID_IPropertyBag;
284 +#define INTERFACE IPropertyBag
285 +DECLARE_INTERFACE_(IPropertyBag,IUnknown)
286 +{
287 + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
288 + STDMETHOD_(ULONG,AddRef)(THIS) PURE;
289 + STDMETHOD_(ULONG,Release)(THIS) PURE;
290 + STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE;
291 + STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE;
292 +};
293 +#undef INTERFACE
294 +
295 #ifdef __cplusplus
296 }
297 #endif
298 --- include/objidl.h.orig 2006-11-19 08:08:34.000000000 +0900
299 +++ include/objidl.h 2008-11-30 11:56:53.875000000 +0900
300 @@ -1,3 +1,4 @@
301 +#include <ole2.h>
302 #ifndef _OBJIDL_H
303 #define _OBJIDL_H
304 #if __GNUC__ >= 3
305 @@ -127,6 +128,7 @@
306 struct IAdviseSink *pAdvSink;
307 DWORD dwConnection;
308 } STATDATA;
309 +#if 0
310 typedef struct tagSTATPROPSETSTG {
311 FMTID fmtid;
312 CLSID clsid;
313 @@ -135,6 +137,7 @@
314 FILETIME ctime;
315 FILETIME atime;
316 } STATPROPSETSTG;
317 +#endif
318 typedef enum tagEXTCONN {
319 EXTCONN_STRONG=1,
320 EXTCONN_WEAK=2,
321 @@ -247,6 +250,7 @@
322 typedef enum tagSERVERCALL {
323 SERVERCALL_ISHANDLED,SERVERCALL_REJECTED,SERVERCALL_RETRYLATER
324 } SERVERCALL;
325 +#if 0
326 typedef struct tagCAUB {
327 ULONG cElems;
328 unsigned char *pElems;
329 @@ -406,6 +410,7 @@
330 PROPSETFLAG_DEFAULT,PROPSETFLAG_NONSIMPLE,PROPSETFLAG_ANSI,
331 PROPSETFLAG_UNBUFFERED=4
332 } PROPSETFLAG;
333 +#endif
334 typedef struct tagSTORAGELAYOUT {
335 DWORD LayoutType;
336 OLECHAR* pwcsElementName;
337 @@ -454,8 +459,10 @@
338 DECLARE_ENUMERATOR(FORMATETC);
339 DECLARE_ENUMERATOR(HLITEM);
340 DECLARE_ENUMERATOR(STATDATA);
341 +#if 0
342 DECLARE_ENUMERATOR(STATPROPSETSTG);
343 DECLARE_ENUMERATOR(STATPROPSTG);
344 +#endif
345 DECLARE_ENUMERATOR(STATSTG);
346 DECLARE_ENUMERATOR_(IEnumString,LPOLESTR);
347 DECLARE_ENUMERATOR_(IEnumMoniker,_COM_interface IMoniker*);
348 @@ -880,8 +887,8 @@
349 STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
350 STDMETHOD_(ULONG,AddRef)(THIS) PURE;
351 STDMETHOD_(ULONG,Release)(THIS) PURE;
352 - STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE;
353 - STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
354 + STDMETHOD_(DWORD,AddConnection)(THIS_ DWORD,DWORD) PURE;
355 + STDMETHOD_(DWORD,ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
356 };
357 #undef INTERFACE
358
359 @@ -927,6 +934,7 @@
360 };
361 #undef INTERFACE
362
363 +#if 0
364 EXTERN_C const IID IID_IPropertyStorage;
365 #define INTERFACE IPropertyStorage
366 DECLARE_INTERFACE_(IPropertyStorage,IUnknown)
367 @@ -962,6 +970,7 @@
368 STDMETHOD(Enum)(THIS_ IEnumSTATPROPSETSTG**) PURE;
369 };
370 #undef INTERFACE
371 +#endif
372
373 EXTERN_C const IID IID_IClientSecurity;
374 #define INTERFACE IClientSecurity
375 --- include/objfwd.h.orig 2006-03-26 09:21:36.000000000 +0900
376 +++ include/objfwd.h 2006-03-26 09:21:42.000000000 +0900
377 @@ -27,7 +27,7 @@
378 typedef _COM_interface IEnumFORMATETC *LPENUMFORMATETC;
379 typedef _COM_interface IEnumSTATDATA *LPENUMSTATDATA;
380 typedef _COM_interface IEnumSTATSTG *LPENUMSTATSTG;
381 -typedef _COM_interface IEnumSTATPROPSTG LPENUMSTATPROPSTG;
382 +typedef _COM_interface IEnumSTATPROPSTG *LPENUMSTATPROPSTG;
383 typedef _COM_interface IEnumString *LPENUMSTRING;
384 typedef _COM_interface IEnumUnknown *LPENUMUNKNOWN;
385 typedef _COM_interface IStorage *LPSTORAGE;
386 --- include/uxtheme.h.orig 2006-11-19 08:08:36.000000000 +0900
387 +++ include/uxtheme.h 2007-01-18 18:51:37.125000000 +0900
388 @@ -10,7 +10,7 @@
389 extern "C" {
390 #endif
391
392 -#if (_WIN32_WINNT >= 0x0501)
393 +//#if (_WIN32_WINNT >= 0x0501)
394 #define DTBG_CLIPRECT 0x00000001
395 #define DTBG_DRAWSOLID 0x00000002
396 #define DTBG_OMITBORDER 0x00000004
397 @@ -265,7 +265,7 @@
398 HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);
399 void WINAPI SetThemeAppProperties(DWORD);
400 HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);
401 -#endif
402 +//#endif
403
404 #ifdef __cplusplus
405 }
406 --- include/winbase.h.orig 2006-11-19 08:08:36.000000000 +0900
407 +++ include/winbase.h 2007-07-27 21:14:27.621750000 +0900
408 @@ -993,12 +993,14 @@
409 WORD Reserved2;
410 CHAR szPathName[OFS_MAXPATHNAME];
411 } OFSTRUCT,*LPOFSTRUCT,*POFSTRUCT;
412 +#if 0
413 typedef struct _WIN_CERTIFICATE {
414 DWORD dwLength;
415 WORD wRevision;
416 WORD wCertificateType;
417 BYTE bCertificate[1];
418 } WIN_CERTIFICATE, *LPWIN_CERTIFICATE;
419 +#endif
420 #if (_WIN32_WINNT >= 0x0501)
421 typedef struct tagACTCTXA {
422 ULONG cbSize;
423 @@ -1342,8 +1344,8 @@
424 WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
425 WINBASEAPI BOOL WINAPI FindFirstFreeAce(PACL,PVOID*);
426 #if (_WIN32_WINNT >= 0x0500)
427 -WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD);
428 -WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD);
429 +WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPSTR,DWORD);
430 +WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPWSTR,DWORD);
431 WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD);
432 WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD);
433 #endif
434 @@ -1351,7 +1353,7 @@
435 WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
436 WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
437 #if (_WIN32_WINNT >= 0x0500)
438 -WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD);
439 +WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPSTR,DWORD);
440 WINBASEAPI BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD);
441 WINBASEAPI BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD);
442 WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD);
443 @@ -1463,10 +1465,10 @@
444 WINBASEAPI DWORD WINAPI GetLogicalDrives(void);
445 WINBASEAPI DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR);
446 WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR);
447 -#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
448 +//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
449 WINBASEAPI DWORD WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD);
450 WINBASEAPI DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
451 -#endif
452 +//#endif
453 WINBASEAPI BOOL WINAPI GetMailslotInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD);
454 WINBASEAPI DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD);
455 WINBASEAPI DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD);
456 @@ -1504,9 +1506,9 @@
457 #endif
458 WINBASEAPI HANDLE WINAPI GetProcessHeap(VOID);
459 WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE);
460 -#if (_WIN32_WINNT >= 0x0501)
461 +//#if (_WIN32_WINNT >= 0x0501)
462 WINBASEAPI DWORD WINAPI GetProcessId(HANDLE);
463 -#endif
464 +//#endif
465 #if (_WIN32_WINNT >= 0x0500)
466 WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS);
467 #endif
468 @@ -1784,9 +1786,9 @@
469 WINBASEAPI BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE);
470 WINBASEAPI HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
471 WINBASEAPI HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
472 -#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
473 +//#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
474 WINBASEAPI HANDLE WINAPI OpenThread(DWORD,BOOL,DWORD);
475 -#endif
476 +//#endif
477 WINBASEAPI BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE);
478 WINBASEAPI HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR);
479 WINBASEAPI HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR);
480 @@ -2024,6 +2026,7 @@
481 WINBASEAPI BOOL WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);
482 WINBASEAPI BOOL WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR);
483 WINBASEAPI DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL);
484 +WINBASEAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL);
485 #define Yield()
486 #if (_WIN32_WINNT >= 0x0501)
487 WINBASEAPI BOOL WINAPI ZombifyActCtx(HANDLE);
488 @@ -2130,9 +2133,9 @@
489 #define GetFileAttributesEx GetFileAttributesExW
490 #define GetFullPathName GetFullPathNameW
491 #define GetLogicalDriveStrings GetLogicalDriveStringsW
492 -#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
493 +//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
494 #define GetLongPathName GetLongPathNameW
495 -#endif
496 +//#endif
497 #define GetModuleFileName GetModuleFileNameW
498 #define GetModuleHandle GetModuleHandleW
499 #if (_WIN32_WINNT >= 0x0500)
500 @@ -2325,9 +2328,9 @@
501 #define GetFileAttributesEx GetFileAttributesExA
502 #define GetFullPathName GetFullPathNameA
503 #define GetLogicalDriveStrings GetLogicalDriveStringsA
504 -#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
505 +//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
506 #define GetLongPathName GetLongPathNameA
507 -#endif
508 +//#endif
509 #define GetNamedPipeHandleState GetNamedPipeHandleStateA
510 #define GetModuleHandle GetModuleHandleA
511 #if (_WIN32_WINNT >= 0x0500)
512 --- include/wininet.h.orig 2006-03-26 09:21:36.000000000 +0900
513 +++ include/wininet.h 2006-04-04 23:18:14.000000000 +0900
514 @@ -868,6 +868,7 @@
515 BOOL WINAPI InternetAutodial(DWORD,DWORD);
516 BOOL WINAPI InternetAutodialHangup(DWORD);
517 BOOL WINAPI InternetGetConnectedState(LPDWORD,DWORD);
518 +BOOL WINAPI InternetGetConnectedStateEx(LPDWORD,LPTSTR,DWORD,DWORD);
519 BOOL WINAPI InternetSetDialState(LPCTSTR,DWORD,DWORD);
520 BOOL WINAPI InternetReadFileExA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD_PTR);
521 BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
522 --- include/winnt.h.orig 2006-11-19 08:08:37.000000000 +0900
523 +++ include/winnt.h 2007-01-16 07:06:57.796875000 +0900
524 @@ -67,9 +67,9 @@
525 #endif
526 #endif
527
528 -#ifndef C_ASSERT
529 -#define C_ASSERT(expr) typedef char __C_ASSERT__[(expr)?1:-1]
530 -#endif
531 +//#ifndef C_ASSERT
532 +//#define C_ASSERT(expr) typedef char __C_ASSERT__[(expr)?1:-1]
533 +//#endif
534
535 #ifndef VOID
536 #define VOID void
537 --- include/winver.h.orig 2006-03-26 09:21:36.000000000 +0900
538 +++ include/winver.h 2006-03-26 09:21:42.000000000 +0900
539 @@ -101,10 +101,10 @@
540 DWORD WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT);
541 DWORD WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT);
542 DWORD WINAPI VerInstallFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT);
543 -DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,PDWORD);
544 -DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,PDWORD);
545 -BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID);
546 -BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID);
547 +DWORD WINAPI GetFileVersionInfoSizeA(LPSTR,PDWORD);
548 +DWORD WINAPI GetFileVersionInfoSizeW(LPWSTR,PDWORD);
549 +BOOL WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,PVOID);
550 +BOOL WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,PVOID);
551 DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
552 DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
553 BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT);
554 --- include/wtypes.h.orig 2006-11-19 08:08:37.000000000 +0900
555 +++ include/wtypes.h 2007-01-19 23:05:02.531250000 +0900
556 @@ -66,6 +66,19 @@
557 unsigned short asData[1];
558 }FLAGGED_WORD_BLOB;
559
560 +typedef struct _COAUTHIDENTITY
561 + {
562 + /* [size_is] */ USHORT *User;
563 + /* [range] */ ULONG UserLength;
564 + /* [size_is] */ USHORT *Domain;
565 + /* [range] */ ULONG DomainLength;
566 + /* [size_is] */ USHORT *Password;
567 + /* [range] */ ULONG PasswordLength;
568 + ULONG Flags;
569 + } COAUTHIDENTITY;
570 +
571 +typedef WORD CLIPFORMAT,*LPCLIPFORMAT;
572 +
573 #ifndef OLE2ANSI
574 typedef WCHAR OLECHAR;
575 typedef LPWSTR LPOLESTR;
576 @@ -94,6 +107,7 @@
577 }_STRUCT_NAME(s);
578 LONGLONG int64;
579 } CY;
580 +typedef union tagCY *LPCY;
581 typedef double DATE;
582 typedef struct tagBSTRBLOB {
583 ULONG cbSize;
584 @@ -165,6 +179,52 @@
585 #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
586 #endif
587 typedef void *HMETAFILEPICT;
588 +
589 +typedef enum tagTYSPEC {
590 + TYSPEC_CLSID,
591 + TYSPEC_FILEEXT,
592 + TYSPEC_MIMETYPE,
593 + TYSPEC_FILENAME,
594 + TYSPEC_PROGID,
595 + TYSPEC_PACKAGENAME,
596 + TYSPEC_OBJECTID
597 +} TYSPEC;
598 +
599 +typedef union {
600 + CLSID clsid;
601 + LPOLESTR pFileExt;
602 + LPOLESTR pMimeType;
603 + LPOLESTR pProgId;
604 + LPOLESTR pFileName;
605 + struct {
606 + LPOLESTR pPackageName;
607 + GUID PolicyId;
608 + } ByName;
609 + struct {
610 + GUID ObjectId;
611 + GUID PolicyId;
612 + } ByObjectId;
613 +} uCLSSPEC;
614 +
615 +typedef struct tagCSPLATFORM {
616 + DWORD dwContext;
617 + DWORD dwVersionHi;
618 + DWORD dwVersionLo;
619 + DWORD dwProcessorArch;
620 +} CSPLATFORM;
621 +
622 +typedef struct tagQUERYCONTEXT {
623 + DWORD dwContext;
624 + CSPLATFORM Platform;
625 + LCID Locale;
626 + DWORD dwVersionHi;
627 + DWORD dwVersionLo;
628 +} QUERYCONTEXT;
629 +typedef struct
630 +{
631 + GUID fmtid;
632 + DWORD pid;
633 +} PROPERTYKEY;
634 #ifdef __cplusplus
635 }
636 #endif
637 --- include/sys/stat.h.orig 2006-06-25 19:45:42.000000000 +0900
638 +++ include/sys/stat.h 2006-12-30 18:26:27.578125000 +0900
639 @@ -11,6 +11,9 @@
640
641 #ifndef _STAT_H_
642 #define _STAT_H_
643 +#if __GNUC__ >=3
644 +#pragma GCC system_header
645 +#endif
646
647 /* All the headers include this file. */
648 #include <_mingw.h>
649 --- include/adoctint.h.orig 2005-04-04 18:50:18.000000000 +0900
650 +++ include/adoctint.h 2007-12-14 23:43:07.754125000 +0900
651 @@ -11,6 +11,9 @@
652 //--------------------------------------------------------------------
653 #ifndef _ADOCTINT_H_
654 #define _ADOCTINT_H_
655 +#if __GNUC__ >=3
656 +#pragma GCC system_header
657 +#endif
658
659 #ifndef _INC_TCHAR
660 #include <tchar.h>
661 @@ -2489,11 +2492,11 @@
662 #endif /* __Procedure_INTERFACE_DEFINED__ */
663 EXTERN_C const CLSID CLSID_Catalog;
664 #ifdef __cplusplus
665 -Catalog;
666 +//Catalog;
667 #endif
668 EXTERN_C const CLSID CLSID_Table;
669 #ifdef __cplusplus
670 -Table;
671 +//Table;
672 #endif
673 #ifndef __Property_INTERFACE_DEFINED__
674 #define __Property_INTERFACE_DEFINED__
675 @@ -2635,23 +2638,23 @@
676 #endif /* __Property_INTERFACE_DEFINED__ */
677 EXTERN_C const CLSID CLSID_Group;
678 #ifdef __cplusplus
679 -Group;
680 +//Group;
681 #endif
682 EXTERN_C const CLSID CLSID_User;
683 #ifdef __cplusplus
684 -User;
685 +//User;
686 #endif
687 EXTERN_C const CLSID CLSID_Column;
688 #ifdef __cplusplus
689 -Column;
690 +//Column;
691 #endif
692 EXTERN_C const CLSID CLSID_Index;
693 #ifdef __cplusplus
694 -Index;
695 +//Index;
696 #endif
697 EXTERN_C const CLSID CLSID_Key;
698 #ifdef __cplusplus
699 -Key;
700 +//Key;
701 #endif
702 #ifndef __Tables_INTERFACE_DEFINED__
703 #define __Tables_INTERFACE_DEFINED__
704 @@ -3332,8 +3335,8 @@
705 /* [in] */ VARIANT Item,
706 /* [defaultvalue][in] */ KeyTypeEnum Type,
707 /* [optional][in] */ VARIANT Column,
708 - /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = L"",
709 - /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = L"") = 0;
710 + /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = const_cast<BSTR>(L""),
711 + /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = const_cast<BSTR>(L"")) = 0;
712
713 virtual /* [helpcontext] */ HRESULT STDMETHODCALLTYPE Delete(
714 /* [in] */ VARIANT Item) = 0;
715 --- include/adodef.h.orig 2005-04-04 18:50:18.000000000 +0900
716 +++ include/adodef.h 2007-01-05 21:48:51.265625000 +0900
717 @@ -12,6 +12,9 @@
718
719 #ifndef _ADODEF_H_
720 #define _ADODEF_H_
721 +#if __GNUC__ >=3
722 +#pragma GCC system_header
723 +#endif
724
725 // TYPELIB MAJOR VERSIONS
726 #define ADO_MAJOR 6
727 --- include/adoguids.h.orig 2005-04-04 18:50:18.000000000 +0900
728 +++ include/adoguids.h 2007-01-05 21:50:10.265625000 +0900
729 @@ -11,6 +11,10 @@
730 //-----------------------------------------------------------------------------
731
732
733 +#if __GNUC__ >=3
734 +#pragma GCC system_header
735 +#endif
736 +
737 #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
738
739 #if defined(__midl) || defined(GEN_MIDL)
740 --- include/adoint.h.orig 2005-04-04 18:50:18.000000000 +0900
741 +++ include/adoint.h 2007-01-02 17:36:43.593750000 +0900
742 @@ -11,6 +11,9 @@
743 //--------------------------------------------------------------------
744 #ifndef _ADOINT_H_
745 #define _ADOINT_H_
746 +#if __GNUC__ >=3
747 +#pragma GCC system_header
748 +#endif
749
750 #ifndef _INC_TCHAR
751 #include <tchar.h>
752 @@ -3494,7 +3497,7 @@
753 #endif /* __ADOConnectionConstruction_INTERFACE_DEFINED__ */
754 EXTERN_C const CLSID CLSID_Connection;
755 #ifdef __cplusplus
756 -Connection;
757 +//Connection;
758 #endif
759 #ifndef ___Record_INTERFACE_DEFINED__
760 #define ___Record_INTERFACE_DEFINED__
761 @@ -3793,7 +3796,7 @@
762 #endif /* ___Record_INTERFACE_DEFINED__ */
763 EXTERN_C const CLSID CLSID_Record;
764 #ifdef __cplusplus
765 -Record;
766 +//Record;
767 #endif
768 #ifndef ___Stream_INTERFACE_DEFINED__
769 #define ___Stream_INTERFACE_DEFINED__
770 @@ -4123,7 +4126,7 @@
771 #endif /* ___Stream_INTERFACE_DEFINED__ */
772 EXTERN_C const CLSID CLSID_Stream;
773 #ifdef __cplusplus
774 -Stream;
775 +//Stream;
776 #endif
777 #ifndef __ADORecordConstruction_INTERFACE_DEFINED__
778 #define __ADORecordConstruction_INTERFACE_DEFINED__
779 @@ -4405,11 +4408,11 @@
780 #endif /* __ADOCommandConstruction_INTERFACE_DEFINED__ */
781 EXTERN_C const CLSID CLSID_Command;
782 #ifdef __cplusplus
783 -Command;
784 +//Command;
785 #endif
786 EXTERN_C const CLSID CLSID_Recordset;
787 #ifdef __cplusplus
788 -Recordset;
789 +//Recordset;
790 #endif
791 #ifndef __Recordset15_INTERFACE_DEFINED__
792 #define __Recordset15_INTERFACE_DEFINED__
793 @@ -8305,7 +8308,7 @@
794 #endif /* ___Parameter_INTERFACE_DEFINED__ */
795 EXTERN_C const CLSID CLSID_Parameter;
796 #ifdef __cplusplus
797 -Parameter;
798 +//Parameter;
799 #endif
800 #ifndef __Parameters_INTERFACE_DEFINED__
801 #define __Parameters_INTERFACE_DEFINED__
802 --- include/bcrypt.h.orig 2008-01-18 22:17:12.000000000 +0900
803 +++ include/bcrypt.h 2008-04-10 22:57:54.410750000 +0900
804 @@ -40,12 +40,6 @@
805 #define OPTIONAL
806 #endif
807
808 -#if !defined(__midl)
809 -#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT))
810 -#else
811 -#define BCRYPT_STRUCT_ALIGNMENT
812 -#endif /*!defined(__midl)*/
813 -
814 //
815 // Alignment macros
816 //
817 @@ -57,11 +51,7 @@
818 #define BCRYPT_OBJECT_ALIGNMENT 4
819 #endif
820
821 -#if !defined(__midl)
822 -#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT))
823 -#else
824 #define BCRYPT_STRUCT_ALIGNMENT
825 -#endif /*!defined(__midl)*/
826
827 //
828 // DeriveKey KDF Types
829 @@ -108,7 +98,11 @@
830
831 typedef BCRYPT_KEY_LENGTHS_STRUCT BCRYPT_AUTH_TAG_LENGTHS_STRUCT;
832
833 -#pragma pack(push, BCRYPT_OBJECT_ALIGNMENT)
834 +#if defined(_IA64_) || defined(_AMD64_)
835 +#pragma pack(push, 8)
836 +#else
837 +#pragma pack(push, 4)
838 +#endif
839 typedef BCRYPT_STRUCT_ALIGNMENT struct _BCRYPT_OID
840 {
841 ULONG cbOID;
842 --- include/commctrl.h.orig 2008-01-18 22:17:14.000000000 +0900
843 +++ include/commctrl.h 2009-02-16 21:34:39.065125000 +0900
844 @@ -14,6 +14,14 @@
845 #ifndef _INC_COMMCTRL
846 #define _INC_COMMCTRL
847
848 +#define __in
849 +#define __out
850 +#ifdef __cplusplus
851 +#define __inline inline
852 +#else
853 +#define __inline static __inline__
854 +#endif
855 +
856 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
857 #pragma warning(push)
858 #pragma warning(disable:4001) /* nonstandard extension : single line comment */
859 @@ -23,7 +31,7 @@
860
861 #ifndef _HRESULT_DEFINED
862 #define _HRESULT_DEFINED
863 -typedef __success(return >= 0) long HRESULT;
864 +typedef long HRESULT;
865 #endif // !_HRESULT_DEFINED
866
867 #ifndef NOUSER
868 @@ -369,8 +377,10 @@
869
870 // Shell reserved (0U-580U) - (0U-589U)
871
872 +#ifndef CDN_FIRST
873 #define CDN_FIRST (0U-601U) // common dialog (new)
874 #define CDN_LAST (0U-699U)
875 +#endif
876
877 #define TBN_FIRST (0U-700U) // toolbar
878 #define TBN_LAST (0U-720U)
879 @@ -683,7 +693,7 @@
880 #define ILP_DOWNLEVEL 1 // Write or reads the stream using downlevel sematics.
881
882
883 -WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv);
884 +//WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv);
885 WINCOMMCTRLAPI HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD dwFlags, LPSTREAM pstm);
886 #endif
887
888 @@ -713,7 +723,7 @@
889 #endif
890
891 #if (_WIN32_WINNT >= 0x0501)
892 -WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv);
893 +//WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv);
894
895 #ifdef __cplusplus
896 FORCEINLINE HIMAGELIST IImageListToHIMAGELIST(struct IImageList *himl)
897 @@ -8056,8 +8066,10 @@
898 #if (_WIN32_WINNT >= 0x0501)
899
900 // custom combobox control messages
901 +#ifndef CB_SETMINVISIBLE
902 #define CB_SETMINVISIBLE (CBM_FIRST + 1)
903 #define CB_GETMINVISIBLE (CBM_FIRST + 2)
904 +#endif
905 #define CB_SETCUEBANNER (CBM_FIRST + 3)
906 #define CB_GETCUEBANNER (CBM_FIRST + 4)
907
908 @@ -8651,7 +8663,7 @@
909
910 #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
911 #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
912 -#include "commctrl.inl"
913 +//#include "commctrl.inl"
914 #endif /* ISOLATION_AWARE_ENABLED */
915 #endif /* RC */
916
917 @@ -8666,6 +8678,10 @@
918 #pragma warning(pop)
919 #endif
920
921 +#undef __in
922 +#undef __out
923 +#undef __inline
924 +
925 #endif /* _INC_COMMCTRL */
926
927
928 --- include/control.h.orig 2005-04-14 17:54:38.000000000 +0900
929 +++ include/control.h 2007-01-02 22:16:33.031250000 +0900
930 @@ -1,3 +1,6 @@
931 +#if __GNUC__ >=3
932 +#pragma GCC system_header
933 +#endif
934
935
936 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
937 --- include/dispex.h.orig 2007-03-31 19:44:54.000000000 +0900
938 +++ include/dispex.h 2007-03-24 17:40:20.000000000 +0900
939 @@ -1,3 +1,6 @@
940 +#if __GNUC__ >=3
941 +#pragma GCC system_header
942 +#endif
943
944
945 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
946 --- include/filter.h.orig 2005-04-14 17:54:44.000000000 +0900
947 +++ include/filter.h 2007-01-02 11:15:03.671875000 +0900
948 @@ -1,3 +1,6 @@
949 +#if __GNUC__ >=3
950 +#pragma GCC system_header
951 +#endif
952
953
954 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
955 --- include/gdiplusbitmap.h.orig 2005-04-14 17:54:44.000000000 +0900
956 +++ include/gdiplusbitmap.h 2007-01-02 11:17:13.125000000 +0900
957 @@ -1,3 +1,6 @@
958 +#if __GNUC__ >=3
959 +#pragma GCC system_header
960 +#endif
961 /**************************************************************************\
962 *
963 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
964 --- include/gdiplusbrush.h.orig 2005-04-14 17:54:44.000000000 +0900
965 +++ include/gdiplusbrush.h 2007-01-02 10:33:22.734375000 +0900
966 @@ -1,3 +1,6 @@
967 +#if __GNUC__ >=3
968 +#pragma GCC system_header
969 +#endif
970 /**************************************************************************\
971 *
972 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
973 --- include/gdiplusenums.h.orig 2003-03-26 16:34:34.000000000 +0900
974 +++ include/gdiplusenums.h 2004-12-30 20:42:34.000000000 +0900
975 @@ -542,7 +542,7 @@
976
977 #define GDIP_EMFPLUS_RECORD_BASE 0x00004000
978 #define GDIP_WMF_RECORD_BASE 0x00010000
979 -#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((EmfPlusRecordType)((n) | GDIP_WMF_RECORD_BASE))
980 +#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((n) | GDIP_WMF_RECORD_BASE)
981 #define GDIP_EMFPLUS_RECORD_TO_WMF(n) ((n) & (~GDIP_WMF_RECORD_BASE))
982 #define GDIP_IS_WMF_RECORDTYPE(n) (((n) & GDIP_WMF_RECORD_BASE) != 0)
983
984 --- include/gdiplusfont.h.orig 2005-04-14 17:54:44.000000000 +0900
985 +++ include/gdiplusfont.h 2007-01-02 10:35:57.671875000 +0900
986 @@ -1,3 +1,6 @@
987 +#if __GNUC__ >=3
988 +#pragma GCC system_header
989 +#endif
990 /**************************************************************************\
991 *
992 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
993 --- include/gdiplusheaders.h.orig 2008-01-18 22:17:46.000000000 +0900
994 +++ include/gdiplusheaders.h 2008-03-28 21:44:34.907750000 +0900
995 @@ -704,7 +704,7 @@
996
997 class CachedBitmap : public GdiplusBase
998 {
999 - friend Graphics;
1000 + friend class Graphics;
1001
1002 public:
1003 CachedBitmap(IN Bitmap *bitmap,
1004 @@ -888,7 +888,7 @@
1005
1006 UINT GetDownLevelRasterizationLimit() const;
1007
1008 - static UINT Metafile::EmfToWmfBits(
1009 + static UINT EmfToWmfBits(
1010 IN HENHMETAFILE hemf,
1011 IN UINT cbData16,
1012 OUT LPBYTE pData16,
1013 --- include/gdiplusimageattributes.h.orig 2005-04-14 17:54:44.000000000 +0900
1014 +++ include/gdiplusimageattributes.h 2007-01-02 10:21:23.031250000 +0900
1015 @@ -32,6 +32,9 @@
1016
1017 #ifndef _GDIPLUSIMAGEATTRIBUTES_H
1018 #define _GDIPLUSIMAGEATTRIBUTES_H
1019 +#if __GNUC__ >=3
1020 +#pragma GCC system_header
1021 +#endif
1022
1023 class GpImageAttributes;
1024
1025 --- include/gdiplusimaging.h.orig 2003-03-26 16:34:34.000000000 +0900
1026 +++ include/gdiplusimaging.h 2007-12-04 21:16:38.000000000 +0900
1027 @@ -160,7 +160,7 @@
1028 UINT Width;
1029 UINT Height;
1030 INT Stride;
1031 - PixelFormat PixelFormat;
1032 + ::Gdiplus::PixelFormat PixelFormat;
1033 VOID* Scan0;
1034 UINT_PTR Reserved;
1035 };
1036 --- include/gdiplusmatrix.h.orig 2005-04-14 17:54:44.000000000 +0900
1037 +++ include/gdiplusmatrix.h 2007-01-02 10:32:35.203125000 +0900
1038 @@ -1,3 +1,6 @@
1039 +#if __GNUC__ >=3
1040 +#pragma GCC system_header
1041 +#endif
1042 /**************************************************************************\
1043 *
1044 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
1045 --- include/gdipluspath.h.orig 2005-04-14 17:54:44.000000000 +0900
1046 +++ include/gdipluspath.h 2007-01-02 10:34:33.125000000 +0900
1047 @@ -1,3 +1,6 @@
1048 +#if __GNUC__ >=3
1049 +#pragma GCC system_header
1050 +#endif
1051 /**************************************************************************\
1052 *
1053 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
1054 --- include/gdipluspen.h.orig 2005-04-14 17:54:44.000000000 +0900
1055 +++ include/gdipluspen.h 2007-01-02 10:34:12.593750000 +0900
1056 @@ -1,3 +1,6 @@
1057 +#if __GNUC__ >=3
1058 +#pragma GCC system_header
1059 +#endif
1060 /**************************************************************************\
1061 *
1062 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
1063 --- include/gdiplusregion.h.orig 2005-04-14 17:54:44.000000000 +0900
1064 +++ include/gdiplusregion.h 2007-01-02 10:35:23.453125000 +0900
1065 @@ -1,3 +1,6 @@
1066 +#if __GNUC__ >=3
1067 +#pragma GCC system_header
1068 +#endif
1069 /**************************************************************************\
1070 *
1071 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
1072 --- include/gdiplusstringformat.h.orig 2005-04-14 17:54:44.000000000 +0900
1073 +++ include/gdiplusstringformat.h 2007-08-29 23:10:06.497500000 +0900
1074 @@ -217,7 +217,7 @@
1075 ));
1076 }
1077
1078 - StringTrimming StringFormat::GetTrimming() const
1079 + StringTrimming GetTrimming() const
1080 {
1081 StringTrimming trimming;
1082 SetStatus(DllExports::GdipGetStringFormatTrimming(
1083 --- include/imagehlp.h.orig 2008-03-22 06:10:42.084500000 +1000
1084 +++ include/imagehlp.h 2009-02-16 21:34:39.065125000 +0900
1085 @@ -1,3 +1,6 @@
1086 +#if __GNUC__ >=3
1087 +#pragma GCC system_header
1088 +#endif
1089 /*++ BUILD Version: 0000 Increment this if a change has global effects
1090
1091 Copyright (c) Microsoft Corporation. All rights reserved.
1092 @@ -59,6 +62,13 @@
1093 #include <wintrust.h>
1094 #endif
1095
1096 +#define __in
1097 +#define __out
1098 +#ifdef __cplusplus
1099 +#define __inline inline
1100 +#else
1101 +#define __inline static __inline__
1102 +#endif
1103
1104 #ifdef __cplusplus
1105 extern "C" {
1106 @@ -407,7 +417,7 @@
1107 IMAGEAPI
1108 TouchFileTimes (
1109 __in HANDLE FileHandle,
1110 - __in_opt PSYSTEMTIME pSystemTime
1111 + __in_opt LPSYSTEMTIME pSystemTime
1112 );
1113
1114 BOOL
1115 @@ -3950,7 +3960,7 @@
1116 // ThreadId must be 4 bytes on all architectures.
1117 //
1118
1119 -C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4);
1120 +//C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4);
1121
1122 typedef struct _MINIDUMP_THREAD {
1123 ULONG32 ThreadId;
1124 @@ -4684,5 +4694,9 @@
1125 #endif
1126
1127
1128 +#undef __in
1129 +#undef __out
1130 +#undef __inline
1131 +
1132 #endif // _IMAGEHLP_
1133
1134 --- include/intsafe.h.orig 2008-03-22 06:10:42.100125000 +1000
1135 +++ include/intsafe.h 2008-03-24 02:25:53.710750000 +1000
1136 @@ -111,7 +111,7 @@
1137
1138
1139
1140 -typedef __success(return >= 0) long HRESULT;
1141 +typedef long HRESULT;
1142
1143 #define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
1144 #define FAILED(hr) (((HRESULT)(hr)) < 0)
1145 @@ -134,7 +134,7 @@
1146 || defined(_M_IA64) || defined(_M_AMD64)
1147 #define UInt32x32To64(a, b) (((unsigned __int64)((unsigned int)(a))) * ((unsigned __int64)((unsigned int)(b))))
1148 #elif defined(_M_IX86)
1149 -#define UInt32x32To64(a, b) ((unsigned __int64)(((unsigned __int64)((unsigned int)(a))) * ((unsigned int)(b))))
1150 +//#define UInt32x32To64(a, b) ((unsigned __int64)(((unsigned __int64)((unsigned int)(a))) * ((unsigned int)(b))))
1151 #else
1152 #error Must define a target architecture.
1153 #endif
1154 @@ -142,22 +142,22 @@
1155 //
1156 // Min/Max type values
1157 //
1158 -#define INT8_MIN (-127i8 - 1)
1159 +#define INT8_MIN ((signed char)(-127) - 1)
1160 #define SHORT_MIN (-32768)
1161 -#define INT16_MIN (-32767i16 - 1)
1162 -#define INT_MIN (-2147483647 - 1)
1163 -#define INT32_MIN (-2147483647i32 - 1)
1164 -#define LONG_MIN (-2147483647L - 1)
1165 -#define LONGLONG_MIN (-9223372036854775807i64 - 1)
1166 -#define LONG64_MIN (-9223372036854775807i64 - 1)
1167 -#define INT64_MIN (-9223372036854775807i64 - 1)
1168 +#define INT16_MIN ((short)(-32767) - 1)
1169 +//#define INT_MIN (-2147483647 - 1)
1170 +#define INT32_MIN (-2147483647L - 1)
1171 +//#define LONG_MIN (-2147483647L - 1)
1172 +#define LONGLONG_MIN (-9223372036854775807ll - 1)
1173 +#define LONG64_MIN (-9223372036854775807ll - 1)
1174 +#define INT64_MIN (-9223372036854775807ll - 1)
1175 #define INT128_MIN (-170141183460469231731687303715884105727i128 - 1)
1176
1177 #ifdef _WIN64
1178 -#define INT_PTR_MIN (-9223372036854775807i64 - 1)
1179 -#define LONG_PTR_MIN (-9223372036854775807i64 - 1)
1180 -#define PTRDIFF_T_MIN (-9223372036854775807i64 - 1)
1181 -#define SSIZE_T_MIN (-9223372036854775807i64 - 1)
1182 +#define INT_PTR_MIN (-9223372036854775807ll - 1)
1183 +#define LONG_PTR_MIN (-9223372036854775807ll - 1)
1184 +#define PTRDIFF_T_MIN (-9223372036854775807ll - 1)
1185 +#define SSIZE_T_MIN (-9223372036854775807ll - 1)
1186 #else
1187 #define INT_PTR_MIN (-2147483647 - 1)
1188 #define LONG_PTR_MIN (-2147483647L - 1)
1189 @@ -165,44 +165,44 @@
1190 #define SSIZE_T_MIN (-2147483647L - 1)
1191 #endif
1192
1193 -#define INT8_MAX 127i8
1194 -#define UINT8_MAX 0xffui8
1195 +#define INT8_MAX ((signed char)(127))
1196 +#define UINT8_MAX ((unsigned char)(0xff))
1197 #define BYTE_MAX 0xff
1198 #define SHORT_MAX 32767
1199 -#define INT16_MAX 32767i16
1200 +#define INT16_MAX ((short)(32767))
1201 #define USHORT_MAX 0xffff
1202 -#define UINT16_MAX 0xffffui16
1203 +#define UINT16_MAX ((unsigned short)(0xffff))
1204 #define WORD_MAX 0xffff
1205 #define INT_MAX 2147483647
1206 -#define INT32_MAX 2147483647i32
1207 +#define INT32_MAX 2147483647L
1208 #define UINT_MAX 0xffffffff
1209 -#define UINT32_MAX 0xffffffffui32
1210 +#define UINT32_MAX 0xffffffffu
1211 #define LONG_MAX 2147483647L
1212 #define ULONG_MAX 0xffffffffUL
1213 #define DWORD_MAX 0xffffffffUL
1214 -#define LONGLONG_MAX 9223372036854775807i64
1215 -#define LONG64_MAX 9223372036854775807i64
1216 -#define INT64_MAX 9223372036854775807i64
1217 -#define ULONGLONG_MAX 0xffffffffffffffffui64
1218 -#define DWORDLONG_MAX 0xffffffffffffffffui64
1219 -#define ULONG64_MAX 0xffffffffffffffffui64
1220 -#define DWORD64_MAX 0xffffffffffffffffui64
1221 -#define UINT64_MAX 0xffffffffffffffffui64
1222 +#define LONGLONG_MAX 9223372036854775807ll
1223 +#define LONG64_MAX 9223372036854775807ll
1224 +#define INT64_MAX 9223372036854775807ll
1225 +#define ULONGLONG_MAX 0xffffffffffffffffull
1226 +#define DWORDLONG_MAX 0xffffffffffffffffull
1227 +#define ULONG64_MAX 0xffffffffffffffffull
1228 +#define DWORD64_MAX 0xffffffffffffffffull
1229 +#define UINT64_MAX 0xffffffffffffffffull
1230 #define INT128_MAX 170141183460469231731687303715884105727i128
1231 #define UINT128_MAX 0xffffffffffffffffffffffffffffffffui128
1232
1233 #undef SIZE_T_MAX
1234
1235 #ifdef _WIN64
1236 -#define INT_PTR_MAX 9223372036854775807i64
1237 -#define UINT_PTR_MAX 0xffffffffffffffffui64
1238 -#define LONG_PTR_MAX 9223372036854775807i64
1239 -#define ULONG_PTR_MAX 0xffffffffffffffffui64
1240 -#define DWORD_PTR_MAX 0xffffffffffffffffui64
1241 -#define PTRDIFF_T_MAX 9223372036854775807i64
1242 -#define SIZE_T_MAX 0xffffffffffffffffui64
1243 -#define SSIZE_T_MAX 9223372036854775807i64
1244 -#define _SIZE_T_MAX 0xffffffffffffffffui64
1245 +#define INT_PTR_MAX 9223372036854775807ll
1246 +#define UINT_PTR_MAX 0xffffffffffffffffull
1247 +#define LONG_PTR_MAX 9223372036854775807ll
1248 +#define ULONG_PTR_MAX 0xffffffffffffffffull
1249 +#define DWORD_PTR_MAX 0xffffffffffffffffull
1250 +#define PTRDIFF_T_MAX 9223372036854775807ll
1251 +#define SIZE_T_MAX 0xffffffffffffffffull
1252 +#define SSIZE_T_MAX 9223372036854775807ll
1253 +#define _SIZE_T_MAX 0xffffffffffffffffull
1254 #else
1255 #define INT_PTR_MAX 2147483647
1256 #define UINT_PTR_MAX 0xffffffff
1257 @@ -219,39 +219,39 @@
1258 //
1259 // It is common for -1 to be used as an error value
1260 //
1261 -#define INT8_ERROR (-1i8)
1262 -#define UINT8_ERROR 0xffui8
1263 +#define INT8_ERROR (((signed char)(-1)))
1264 +#define UINT8_ERROR ((unsigned char)(0xff))
1265 #define BYTE_ERROR 0xff
1266 #define SHORT_ERROR (-1)
1267 -#define INT16_ERROR (-1i16)
1268 +#define INT16_ERROR (((short)(-1)))
1269 #define USHORT_ERROR 0xffff
1270 -#define UINT16_ERROR 0xffffui16
1271 +#define UINT16_ERROR ((unsigned short)(0xffff))
1272 #define WORD_ERROR 0xffff
1273 #define INT_ERROR (-1)
1274 -#define INT32_ERROR (-1i32)
1275 +#define INT32_ERROR (-1L)
1276 #define UINT_ERROR 0xffffffff
1277 -#define UINT32_ERROR 0xffffffffui32
1278 +#define UINT32_ERROR 0xffffffffuL
1279 #define LONG_ERROR (-1L)
1280 #define ULONG_ERROR 0xffffffffUL
1281 #define DWORD_ERROR 0xffffffffUL
1282 -#define LONGLONG_ERROR (-1i64)
1283 -#define LONG64_ERROR (-1i64)
1284 -#define INT64_ERROR (-1i64)
1285 -#define ULONGLONG_ERROR 0xffffffffffffffffui64
1286 -#define DWORDLONG_ERROR 0xffffffffffffffffui64
1287 -#define ULONG64_ERROR 0xffffffffffffffffui64
1288 -#define UINT64_ERROR 0xffffffffffffffffui64
1289 -
1290 -#ifdef _WIN64
1291 -#define INT_PTR_ERROR (-1i64)
1292 -#define UINT_PTR_ERROR 0xffffffffffffffffui64
1293 -#define LONG_PTR_ERROR (-1i64)
1294 -#define ULONG_PTR_ERROR 0xffffffffffffffffui64
1295 -#define DWORD_PTR_ERROR 0xffffffffffffffffui64
1296 -#define PTRDIFF_T_ERROR (-1i64)
1297 -#define SIZE_T_ERROR 0xffffffffffffffffui64
1298 -#define SSIZE_T_ERROR (-1i64)
1299 -#define _SIZE_T_ERROR 0xffffffffffffffffui64
1300 +#define LONGLONG_ERROR (-1ll)
1301 +#define LONG64_ERROR (-1ll)
1302 +#define INT64_ERROR (-1ll)
1303 +#define ULONGLONG_ERROR 0xffffffffffffffffull
1304 +#define DWORDLONG_ERROR 0xffffffffffffffffull
1305 +#define ULONG64_ERROR 0xffffffffffffffffull
1306 +#define UINT64_ERROR 0xffffffffffffffffull
1307 +
1308 +#ifdef _WIN64
1309 +#define INT_PTR_ERROR (-1ll)
1310 +#define UINT_PTR_ERROR 0xffffffffffffffffull
1311 +#define LONG_PTR_ERROR (-1ll)
1312 +#define ULONG_PTR_ERROR 0xffffffffffffffffull
1313 +#define DWORD_PTR_ERROR 0xffffffffffffffffull
1314 +#define PTRDIFF_T_ERROR (-1ll)
1315 +#define SIZE_T_ERROR 0xffffffffffffffffull
1316 +#define SSIZE_T_ERROR (-1ll)
1317 +#define _SIZE_T_ERROR 0xffffffffffffffffull
1318 #else
1319 #define INT_PTR_ERROR (-1)
1320 #define UINT_PTR_ERROR 0xffffffff
1321 @@ -7570,13 +7570,13 @@
1322
1323 // a * d must be less than 2^32 or there would be bits set in the high 64-bits
1324 ad = (((ULONGLONG)dw_a) * (ULONGLONG)dw_d);
1325 - if ((ad & 0xffffffff00000000) == 0)
1326 + if ((ad & 0xffffffff00000000ULL) == 0)
1327 {
1328 dw_b = (DWORD)ullMultiplicand;
1329
1330 // b * c must be less than 2^32 or there would be bits set in the high 64-bits
1331 bc = (((ULONGLONG)dw_b) * (ULONGLONG)dw_c);
1332 - if ((bc & 0xffffffff00000000) == 0)
1333 + if ((bc & 0xffffffff00000000ULL) == 0)
1334 {
1335 // now sum them all up checking for overflow.
1336 // shifting is safe because we already checked for overflow above
1337 @@ -8015,10 +8015,14 @@
1338 // Macros that are no longer used in this header but which clients may
1339 // depend on being defined here.
1340 //
1341 -#define LOWORD(_dw) ((WORD)(((DWORD_PTR)(_dw)) & 0xffff))
1342 -#define HIWORD(_dw) ((WORD)((((DWORD_PTR)(_dw)) >> 16) & 0xffff))
1343 +//#define LOWORD(_dw) ((WORD)(((DWORD_PTR)(_dw)) & 0xffff))
1344 +//#define HIWORD(_dw) ((WORD)((((DWORD_PTR)(_dw)) >> 16) & 0xffff))
1345 #define LODWORD(_qw) ((DWORD)(_qw))
1346 #define HIDWORD(_qw) ((DWORD)(((_qw) >> 32) & 0xffffffff))
1347
1348 +#undef __in
1349 +#undef __out
1350 +#undef __inline
1351 +
1352 #endif // _INTSAFE_H_INCLUDED_
1353
1354 --- include/mapinls.h.orig 2005-04-14 17:54:46.000000000 +0900
1355 +++ include/mapinls.h 2006-12-30 20:46:11.125000000 +0900
1356 @@ -72,7 +72,7 @@
1357 typedef const void FAR * LPCVOID;
1358
1359 #ifndef _MAC
1360 -#ifndef LPOLESTR
1361 +#ifndef OLESTR
1362 #if !defined (_WIN32)
1363
1364 #define LPOLESTR LPSTR
1365 @@ -88,9 +88,11 @@
1366 #define OLESTR(str) L##str
1367
1368 #endif /* !_WIN32 */
1369 -#endif /* LPOLESTR */
1370 +#endif /* OLESTR */
1371 #endif /* _MAC */
1372
1373 +#ifndef NORM_IGNORECASE
1374 +
1375 #define NORM_IGNORECASE 0x00000001 /* ignore case */
1376 #define NORM_IGNORENONSPACE 0x00000002 /* ignore diacritics */
1377 #define NORM_IGNORESYMBOLS 0x00000004 /* ignore symbols */
1378 @@ -103,6 +105,8 @@
1379 #define NORM_IGNOREKANATYPE 0x00000040 /* ignore kanatype */
1380 #endif
1381
1382 +#endif /* NORM_IGNORECASE */
1383 +
1384 #if defined(WIN16)
1385
1386 #define lstrcpyA lstrcpy
1387 --- include/mapiwin.h.orig 2003-03-26 16:34:38.000000000 +0900
1388 +++ include/mapiwin.h 2004-12-28 21:41:14.000000000 +0900
1389 @@ -428,5 +428,5 @@
1390 #endif
1391
1392 #endif /* __MAPIWIN_H__ */
1393 -\x1a
1394 +
1395
1396 --- include/msdasc.h.orig 2005-04-04 18:50:18.000000000 +0900
1397 +++ include/msdasc.h 2007-01-05 21:47:51.515625000 +0900
1398 @@ -1,3 +1,6 @@
1399 +#if __GNUC__ >=3
1400 +#pragma GCC system_header
1401 +#endif
1402
1403
1404 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1405 --- include/multimon.h.orig 2005-04-14 17:54:52.000000000 +0900
1406 +++ include/multimon.h 2006-12-31 18:00:37.203125000 +0900
1407 @@ -175,7 +175,7 @@
1408
1409 BOOL IsPlatformNT()
1410 {
1411 - OSVERSIONINFOA osvi = {0};
1412 + OSVERSIONINFOA osvi;
1413 osvi.dwOSVersionInfoSize = sizeof(osvi);
1414 GetVersionExA((OSVERSIONINFOA*)&osvi);
1415 return (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId);
1416 --- include/ntquery.h.orig 2008-01-18 22:17:30.000000000 +0900
1417 +++ include/ntquery.h 2009-02-16 21:34:39.065125000 +0900
1418 @@ -1,3 +1,6 @@
1419 +#if __GNUC__ >=3
1420 +#pragma GCC system_header
1421 +#endif
1422 //+---------------------------------------------------------------------------
1423 //
1424 // Microsoft Windows
1425 @@ -18,6 +21,14 @@
1426
1427 #include "stgprop.h"
1428
1429 +#define __in
1430 +#define __out
1431 +#ifdef __cplusplus
1432 +#define __inline inline
1433 +#else
1434 +#define __inline static __inline__
1435 +#endif
1436 +
1437 #if defined(__cplusplus)
1438 extern "C"
1439 {
1440 @@ -404,6 +415,10 @@
1441 }
1442 #endif
1443
1444 +#undef __in
1445 +#undef __out
1446 +#undef __inline
1447 +
1448 #endif // __NTQUERY_H__
1449
1450
1451 --- include/ocidl.h.orig 2008-03-22 06:10:42.272000000 +1000
1452 +++ include/ocidl.h 2009-02-16 21:34:39.065125000 +0900
1453 @@ -1,3 +1,6 @@
1454 +#if __GNUC__ >=3
1455 +#pragma GCC system_header
1456 +#endif
1457
1458
1459 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1460 @@ -294,6 +297,14 @@
1461 #include "servprov.h"
1462 #include "urlmon.h"
1463
1464 +#define __in
1465 +#define __out
1466 +#ifdef __cplusplus
1467 +#define __inline inline
1468 +#else
1469 +#define __inline static __inline__
1470 +#endif
1471 +
1472 #ifdef __cplusplus
1473 extern "C"{
1474 #endif
1475 @@ -4595,11 +4606,13 @@
1476 HITRESULT_HIT = 3
1477 } HITRESULT;
1478
1479 +#if 0
1480 typedef /* [v1_enum] */
1481 enum tagDVASPECT2
1482 { DVASPECT_OPAQUE = 16,
1483 DVASPECT_TRANSPARENT = 32
1484 } DVASPECT2;
1485 +#endif
1486
1487 typedef struct tagExtentInfo
1488 {
1489 @@ -6554,6 +6567,10 @@
1490 }
1491 #endif
1492
1493 +#undef __in
1494 +#undef __out
1495 +#undef __inline
1496 +
1497 #endif
1498
1499
1500 --- include/oleauto.h.orig 2008-03-22 06:10:43.225125000 +1000
1501 +++ include/oleauto.h 2009-02-16 21:34:39.065125000 +0900
1502 @@ -56,6 +56,14 @@
1503 /* pull in the MIDL generated header */
1504 #include <oaidl.h>
1505
1506 +#define __in
1507 +#define __out
1508 +#ifdef __cplusplus
1509 +#define __inline inline
1510 +#else
1511 +#define __inline static __inline__
1512 +#endif
1513 +
1514
1515 /*---------------------------------------------------------------------*/
1516 /* BSTR API */
1517 @@ -948,6 +956,9 @@
1518 /* ICreateTypeLib */
1519 /*---------------------------------------------------------------------*/
1520
1521 +typedef interface ICreateTypeLib ICreateTypeLib;
1522 +typedef interface ICreateTypeLib2 ICreateTypeLib2;
1523 +typedef interface ICreateTypeInfo ICreateTypeInfo;
1524 typedef ICreateTypeLib * LPCREATETYPELIB;
1525
1526 typedef ICreateTypeInfo * LPCREATETYPEINFO;
1527 @@ -1160,7 +1171,7 @@
1528
1529 // Declare variant access functions.
1530
1531 -#if __STDC__ || defined(NONAMELESSUNION)
1532 +#ifdef NONAMELESSUNION
1533 #define V_UNION(X, Y) ((X)->n1.n2.n3.Y)
1534 #define V_VT(X) ((X)->n1.n2.vt)
1535 #define V_RECORDINFO(X) ((X)->n1.n2.n3.brecVal.pRecInfo)
1536 @@ -1242,5 +1253,9 @@
1537 #include <poppack.h>
1538 #endif // RC_INVOKED
1539
1540 +#undef __in
1541 +#undef __out
1542 +#undef __inline
1543 +
1544 #endif // __OLEAUTO_H__
1545
1546 --- include/oledb.h.orig 2005-04-04 18:50:18.000000000 +0900
1547 +++ include/oledb.h 2007-01-02 17:16:30.656250000 +0900
1548 @@ -1,3 +1,6 @@
1549 +#if __GNUC__ >=3
1550 +#pragma GCC system_header
1551 +#endif
1552
1553
1554 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1555 @@ -797,7 +800,7 @@
1556
1557 //@@@+ V2.0
1558 #if( OLEDBVER >= 0x0200 )
1559 -#if !defined(_WINBASE_) && !defined(_FILETIME_)
1560 +#if !defined(_WINBASE_H) && !defined(_FILETIME_)
1561 #define _FILETIME_
1562 typedef struct _FILETIME {
1563 DWORD dwLowDateTime;
1564 --- include/oleidl.h.orig 2008-03-22 06:10:42.350125000 +1000
1565 +++ include/oleidl.h 2009-02-16 21:34:39.065125000 +0900
1566 @@ -1,3 +1,6 @@
1567 +#if __GNUC__ >=3
1568 +#pragma GCC system_header
1569 +#endif
1570
1571
1572 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1573 @@ -189,6 +192,14 @@
1574 /* header files for imported files */
1575 #include "objidl.h"
1576
1577 +#define __in
1578 +#define __out
1579 +#ifdef __cplusplus
1580 +#define __inline inline
1581 +#else
1582 +#define __inline static __inline__
1583 +#endif
1584 +
1585 #ifdef __cplusplus
1586 extern "C"{
1587 #endif
1588 @@ -3868,6 +3879,10 @@
1589 }
1590 #endif
1591
1592 +#undef __in
1593 +#undef __out
1594 +#undef __inline
1595 +
1596 #endif
1597
1598
1599 --- include/propidl.h.orig 2008-01-18 22:17:32.000000000 +0900
1600 +++ include/propidl.h 2009-02-16 21:34:39.065125000 +0900
1601 @@ -76,6 +76,14 @@
1602 #include "objidl.h"
1603 #include "oaidl.h"
1604
1605 +#define __in
1606 +#define __out
1607 +#ifdef __cplusplus
1608 +#define __inline inline
1609 +#else
1610 +#define __inline static __inline__
1611 +#endif
1612 +
1613 #ifdef __cplusplus
1614 extern "C"{
1615 #endif
1616 @@ -285,11 +293,6 @@
1617 #define tag_inner_PROPVARIANT
1618 #endif
1619
1620 -#if !defined(_MSC_EXTENSIONS)
1621 -
1622 -struct tagPROPVARIANT;
1623 -
1624 -#else
1625 #ifndef MIDL_PASS
1626 struct tagPROPVARIANT {
1627 union {
1628 @@ -316,7 +319,7 @@
1629 FLOAT fltVal;
1630 DOUBLE dblVal;
1631 VARIANT_BOOL boolVal;
1632 - _VARIANT_BOOL bool;
1633 +// _VARIANT_BOOL bool;
1634 SCODE scode;
1635 CY cyVal;
1636 DATE date;
1637 @@ -384,8 +387,6 @@
1638 };
1639 #endif
1640
1641 -#endif /* _MSC_EXTENSIONS */
1642 -
1643 #ifdef MIDL_PASS
1644 // This is the LPPROPVARIANT definition for marshaling.
1645 typedef struct tag_inner_PROPVARIANT *LPPROPVARIANT;
1646 @@ -1268,6 +1269,10 @@
1647 }
1648 #endif
1649
1650 +#undef __in
1651 +#undef __out
1652 +#undef __inline
1653 +
1654 #endif
1655
1656
1657 --- include/propsys.h.orig 2008-03-22 06:10:42.412625000 +1000
1658 +++ include/propsys.h 2009-02-16 21:34:39.065125000 +0900
1659 @@ -228,6 +228,14 @@
1660 #endif // 0
1661 #include <propkeydef.h>
1662
1663 +#define __in
1664 +#define __out
1665 +#ifdef __cplusplus
1666 +#define __inline inline
1667 +#else
1668 +#define __inline static __inline__
1669 +#endif
1670 +
1671
1672 extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_c_ifspec;
1673 extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_s_ifspec;
1674 @@ -3600,6 +3608,10 @@
1675 }
1676 #endif
1677
1678 +#undef __in
1679 +#undef __out
1680 +#undef __inline
1681 +
1682 #endif
1683
1684
1685 --- include/qedit.h.orig 2005-04-14 17:54:56.000000000 +0900
1686 +++ include/qedit.h 2007-01-02 22:11:05.140625000 +0900
1687 @@ -1,3 +1,6 @@
1688 +#if __GNUC__ >=3
1689 +#pragma GCC system_header
1690 +#endif
1691
1692
1693 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1694 @@ -6546,10 +6549,10 @@
1695 #define DEX_IDS_GRAPH_ERROR 1427
1696 #define DEX_IDS_GRID_ERROR 1428
1697 #define DEX_IDS_INTERFACE_ERROR 1429
1698 -EXTERN_GUID(CLSID_VideoEffects1Category, 0xcc7bfb42, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1699 -EXTERN_GUID(CLSID_VideoEffects2Category, 0xcc7bfb43, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1700 -EXTERN_GUID(CLSID_AudioEffects1Category, 0xcc7bfb44, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1701 -EXTERN_GUID(CLSID_AudioEffects2Category, 0xcc7bfb45, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1702 +DEFINE_GUID(CLSID_VideoEffects1Category, 0xcc7bfb42, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1703 +DEFINE_GUID(CLSID_VideoEffects2Category, 0xcc7bfb43, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1704 +DEFINE_GUID(CLSID_AudioEffects1Category, 0xcc7bfb44, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1705 +DEFINE_GUID(CLSID_AudioEffects2Category, 0xcc7bfb45, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
1706
1707
1708 extern RPC_IF_HANDLE __MIDL_itf_qedit_0001_0097_v0_0_c_ifspec;
1709 --- include/shlobj.h.orig 2008-01-18 22:17:36.000000000 +0900
1710 +++ include/shlobj.h 2009-02-16 21:34:39.065125000 +0900
1711 @@ -1,3 +1,6 @@
1712 +#if __GNUC__ >=3
1713 +#pragma GCC system_header
1714 +#endif
1715 /*===========================================================================
1716
1717 Copyright (c) Microsoft Corporation. All rights reserved.
1718 @@ -103,6 +106,14 @@
1719 #include <shtypes.h>
1720 #include <shobjidl.h>
1721
1722 +#define __in
1723 +#define __out
1724 +#ifdef __cplusplus
1725 +#define __inline inline
1726 +#else
1727 +#define __inline static __inline__
1728 +#endif
1729 +
1730 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
1731 #pragma once
1732 #endif
1733 @@ -250,9 +261,10 @@
1734 #define GIL_FORCENOSHIELD 0x0400 // icon must *not* be "stamped" with the LUA shield
1735
1736 #undef INTERFACE
1737 +EXTERN_C const IID IID_IExtractIconA;
1738 #define INTERFACE IExtractIconA
1739
1740 -DECLARE_INTERFACE_IID_(IExtractIconA, IUnknown, "000214eb-0000-0000-c000-000000000046")
1741 +DECLARE_INTERFACE_(IExtractIconA, IUnknown)
1742 {
1743 // *** IUnknown methods ***
1744 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1745 @@ -278,9 +290,10 @@
1746 typedef IExtractIconA * LPEXTRACTICONA;
1747
1748 #undef INTERFACE
1749 +EXTERN_C const IID IID_IExtractIconW;
1750 #define INTERFACE IExtractIconW
1751
1752 -DECLARE_INTERFACE_IID_(IExtractIconW, IUnknown, "000214fa-0000-0000-c000-000000000046")
1753 +DECLARE_INTERFACE_(IExtractIconW, IUnknown)
1754 {
1755 // *** IUnknown methods ***
1756 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1757 @@ -350,9 +363,10 @@
1758 //===========================================================================
1759
1760 #undef INTERFACE
1761 +EXTERN_C const IID IID_IShellIconOverlayIdentifier;
1762 #define INTERFACE IShellIconOverlayIdentifier
1763
1764 -DECLARE_INTERFACE_IID_(IShellIconOverlayIdentifier, IUnknown, "0c6c4200-c589-11d0-999a-00c04fd655e1")
1765 +DECLARE_INTERFACE_(IShellIconOverlayIdentifier, IUnknown)
1766 {
1767 // *** IUnknown methods ***
1768 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1769 @@ -399,9 +413,10 @@
1770 //===========================================================================
1771
1772 #undef INTERFACE
1773 +EXTERN_C const IID IID_IShellIconOverlayManager;
1774 #define INTERFACE IShellIconOverlayManager
1775
1776 -DECLARE_INTERFACE_IID_(IShellIconOverlayManager, IUnknown, "f10b5e34-dd3b-42a7-aa7d-2f4ec54bb09b")
1777 +DECLARE_INTERFACE_(IShellIconOverlayManager, IUnknown)
1778 {
1779 // *** IUnknown methods ***
1780 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1781 @@ -447,9 +462,10 @@
1782 //===========================================================================
1783
1784 #undef INTERFACE
1785 +EXTERN_C const IID IID_IShellIconOverlay;
1786 #define INTERFACE IShellIconOverlay
1787
1788 -DECLARE_INTERFACE_IID_(IShellIconOverlay, IUnknown, "7d688a70-c613-11d0-999b-00c04fd655e1")
1789 +DECLARE_INTERFACE_(IShellIconOverlay, IUnknown)
1790 {
1791 // *** IUnknown methods ***
1792 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1793 @@ -636,9 +652,10 @@
1794 //===========================================================================
1795
1796 #undef INTERFACE
1797 +EXTERN_C const IID IID_IShellExecuteHookA;
1798 #define INTERFACE IShellExecuteHookA
1799
1800 -DECLARE_INTERFACE_IID_(IShellExecuteHookA, IUnknown, "000214f5-0000-0000-c000-000000000046")
1801 +DECLARE_INTERFACE_(IShellExecuteHookA, IUnknown)
1802 {
1803 // *** IUnknown methods ***
1804 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1805 @@ -650,9 +667,10 @@
1806 };
1807
1808 #undef INTERFACE
1809 +EXTERN_C const IID IID_IShellExecuteHookW;
1810 #define INTERFACE IShellExecuteHookW
1811
1812 -DECLARE_INTERFACE_IID_(IShellExecuteHookW, IUnknown, "000214fb-0000-0000-c000-000000000046")
1813 +DECLARE_INTERFACE_(IShellExecuteHookW, IUnknown)
1814 {
1815 // *** IUnknown methods ***
1816 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1817 @@ -679,9 +697,10 @@
1818 //===========================================================================
1819
1820 #undef INTERFACE
1821 +EXTERN_C const IID IID_IURLSearchHook;
1822 #define INTERFACE IURLSearchHook
1823
1824 -DECLARE_INTERFACE_IID_(IURLSearchHook, IUnknown, "ac60f6a0-0fd9-11d0-99cb-00c04fd64497")
1825 +DECLARE_INTERFACE_(IURLSearchHook, IUnknown)
1826 {
1827 // *** IUnknown methods ***
1828 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1829 @@ -693,9 +712,10 @@
1830 };
1831
1832 #undef INTERFACE
1833 +EXTERN_C const IID IID_ISearchContext;
1834 #define INTERFACE ISearchContext
1835
1836 -DECLARE_INTERFACE_IID_(ISearchContext, IUnknown, "09F656A2-41AF-480C-88F7-16CC0D164615")
1837 +DECLARE_INTERFACE_(ISearchContext, IUnknown)
1838 {
1839 // *** IUnknown methods ***
1840 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1841 @@ -709,9 +729,10 @@
1842 };
1843
1844 #undef INTERFACE
1845 +EXTERN_C const IID IID_IURLSearchHook2;
1846 #define INTERFACE IURLSearchHook2
1847
1848 -DECLARE_INTERFACE_IID_(IURLSearchHook2, IURLSearchHook, "5ee44da4-6d32-46e3-86bc-07540dedd0e0")
1849 +DECLARE_INTERFACE_(IURLSearchHook2, IURLSearchHook)
1850 {
1851 // *** IURLSearchHook2 methods ***
1852 STDMETHOD(TranslateWithSearchContext)(THIS_ __out_ecount(cchBufferSize) LPWSTR lpwszSearchURL, DWORD cchBufferSize, __in_opt ISearchContext * pSearchContext) PURE;
1853 @@ -724,9 +745,10 @@
1854 //===========================================================================
1855
1856 #undef INTERFACE
1857 +EXTERN_C const IID IID_INewShortcutHookA;
1858 #define INTERFACE INewShortcutHookA
1859
1860 -DECLARE_INTERFACE_IID_(INewShortcutHookA, IUnknown, "000214e1-0000-0000-c000-000000000046")
1861 +DECLARE_INTERFACE_(INewShortcutHookA, IUnknown)
1862 {
1863 // *** IUnknown methods ***
1864 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1865 @@ -743,9 +765,10 @@
1866 };
1867
1868 #undef INTERFACE
1869 +EXTERN_C const IID IID_INewShortcutHookW;
1870 #define INTERFACE INewShortcutHookW
1871
1872 -DECLARE_INTERFACE_IID_(INewShortcutHookW, IUnknown, "000214f7-0000-0000-c000-000000000046")
1873 +DECLARE_INTERFACE_(INewShortcutHookW, IUnknown)
1874 {
1875 // *** IUnknown methods ***
1876 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1877 @@ -800,9 +823,10 @@
1878 //===========================================================================
1879
1880 #undef INTERFACE
1881 +EXTERN_C const IID IID_ICopyHookA;
1882 #define INTERFACE ICopyHookA
1883
1884 -DECLARE_INTERFACE_IID_(ICopyHookA, IUnknown, "000214EF-0000-0000-c000-000000000046")
1885 +DECLARE_INTERFACE_(ICopyHookA, IUnknown)
1886 {
1887 // *** IUnknown methods ***
1888 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1889 @@ -817,9 +841,10 @@
1890 typedef ICopyHookA * LPCOPYHOOKA;
1891
1892 #undef INTERFACE
1893 +EXTERN_C const IID IID_ICopyHookW;
1894 #define INTERFACE ICopyHookW
1895
1896 -DECLARE_INTERFACE_IID_(ICopyHookW, IUnknown, "000214FC-0000-0000-c000-000000000046")
1897 +DECLARE_INTERFACE_(ICopyHookW, IUnknown)
1898 {
1899 // *** IUnknown methods ***
1900 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1901 @@ -853,9 +878,10 @@
1902 //===========================================================================
1903
1904 #undef INTERFACE
1905 +EXTERN_C const IID IID_IFileViewerSite;
1906 #define INTERFACE IFileViewerSite
1907
1908 -DECLARE_INTERFACE_IID_(IFileViewerSite, IUnknown, "000214f3-0000-0000-c000-000000000046")
1909 +DECLARE_INTERFACE_(IFileViewerSite, IUnknown)
1910 {
1911 // *** IUnknown methods ***
1912 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1913 @@ -912,9 +938,10 @@
1914 #define FVSIF_CANVIEWIT 0x40000000 // The viewer can view it.
1915
1916 #undef INTERFACE
1917 +EXTERN_C const IID IID_IFileViewerA;
1918 #define INTERFACE IFileViewerA
1919
1920 -DECLARE_INTERFACE_IID(IFileViewerA, "000214f0-0000-0000-c000-000000000046")
1921 +DECLARE_INTERFACE(IFileViewerA)
1922 {
1923 // *** IUnknown methods ***
1924 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1925 @@ -930,9 +957,10 @@
1926 typedef IFileViewerA * LPFILEVIEWERA;
1927
1928 #undef INTERFACE
1929 +EXTERN_C const IID IID_IFileViewerW;
1930 #define INTERFACE IFileViewerW
1931
1932 -DECLARE_INTERFACE_IID(IFileViewerW, "000214f8-0000-0000-c000-000000000046")
1933 +DECLARE_INTERFACE(IFileViewerW)
1934 {
1935 // *** IUnknown methods ***
1936 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1937 @@ -1484,9 +1512,10 @@
1938 // implement IShellFolder2::GetDetailsOf()/GetDetailsEx() instead
1939
1940 #undef INTERFACE
1941 +EXTERN_C const IID IID_IShellDetails;
1942 #define INTERFACE IShellDetails
1943
1944 -DECLARE_INTERFACE_IID_(IShellDetails, IUnknown, "000214EC-0000-0000-c000-000000000046")
1945 +DECLARE_INTERFACE_(IShellDetails, IUnknown)
1946 {
1947 // *** IUnknown methods ***
1948 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1949 @@ -1513,9 +1542,10 @@
1950 //
1951
1952 #undef INTERFACE
1953 +EXTERN_C const IID IID_IObjMgr;
1954 #define INTERFACE IObjMgr
1955
1956 -DECLARE_INTERFACE_IID_(IObjMgr, IUnknown, "00BB2761-6A77-11D0-A535-00C04FD7D062")
1957 +DECLARE_INTERFACE_(IObjMgr, IUnknown)
1958 {
1959 // *** IUnknown methods ***
1960 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1961 @@ -1547,9 +1577,10 @@
1962 //
1963
1964 #undef INTERFACE
1965 +EXTERN_C const IID IID_ICurrentWorkingDirectory;
1966 #define INTERFACE ICurrentWorkingDirectory
1967
1968 -DECLARE_INTERFACE_IID_(ICurrentWorkingDirectory, IUnknown, "91956D21-9276-11d1-921A-006097DF5BD4")
1969 +DECLARE_INTERFACE_(ICurrentWorkingDirectory, IUnknown)
1970 {
1971 // *** IUnknown methods ***
1972 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1973 @@ -1578,9 +1609,10 @@
1974 //
1975
1976 #undef INTERFACE
1977 +EXTERN_C const IID IID_IACList;
1978 #define INTERFACE IACList
1979
1980 -DECLARE_INTERFACE_IID_(IACList, IUnknown, "77A130B0-94FD-11D0-A544-00C04FD7d062")
1981 +DECLARE_INTERFACE_(IACList, IUnknown)
1982 {
1983 // *** IUnknown methods ***
1984 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
1985 @@ -1597,6 +1629,7 @@
1986 // List COM object that implements this interface.
1987
1988 #undef INTERFACE
1989 +EXTERN_C const IID IID_IACList2;
1990 #define INTERFACE IACList2
1991
1992 typedef enum _tagAUTOCOMPLETELISTOPTIONS
1993 @@ -1615,7 +1648,7 @@
1994 #endif
1995 } AUTOCOMPLETELISTOPTIONS;
1996
1997 -DECLARE_INTERFACE_IID_(IACList2, IACList, "470141a0-5186-11d2-bbb6-0060977b464c")
1998 +DECLARE_INTERFACE_(IACList2, IACList)
1999 {
2000 // *** IACList2 specific methods ***
2001 STDMETHOD(SetOptions)(THIS_ DWORD dwFlag) PURE;
2002 @@ -1692,9 +1725,10 @@
2003
2004
2005 #undef INTERFACE
2006 +EXTERN_C const IID IID_IProgressDialog;
2007 #define INTERFACE IProgressDialog
2008
2009 -DECLARE_INTERFACE_IID_(IProgressDialog, IUnknown, "EBBC7C04-315E-11d2-B62F-006097DF5BD4")
2010 +DECLARE_INTERFACE_(IProgressDialog, IUnknown)
2011 {
2012 // *** IUnknown methods ***
2013 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
2014 @@ -1751,9 +1785,10 @@
2015
2016
2017 #undef INTERFACE
2018 +EXTERN_C const IID IID_IDockingWindowSite;
2019 #define INTERFACE IDockingWindowSite
2020
2021 -DECLARE_INTERFACE_IID_(IDockingWindowSite, IOleWindow, "2a342fc2-7b26-11d0-8ca9-00a0c92dbfe8")
2022 +DECLARE_INTERFACE_(IDockingWindowSite, IOleWindow)
2023 {
2024 // *** IUnknown methods ***
2025 STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
2026 @@ -1800,9 +1835,10 @@
2027
2028
2029 #undef INTERFACE
2030 +EXTERN_C const IID IID_IDockingWindowFrame;
2031 #define INTERFACE IDockingWindowFrame
2032
2033 -DECLARE_INTERFACE_IID_(IDockingWindowFrame, IOleWindow, "47d2657a-7b27-11d0-8ca9-00a0c92dbfe8")
2034 +DECLARE_INTERFACE_(IDockingWindowFrame, IOleWindow)
2035 {
2036 // *** IUnknown methods ***
2037 STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
2038 @@ -1829,9 +1865,10 @@
2039 */
2040
2041 #undef INTERFACE
2042 +EXTERN_C const IID IID_IThumbnailCapture;
2043 #define INTERFACE IThumbnailCapture
2044
2045 -DECLARE_INTERFACE_IID_(IThumbnailCapture, IUnknown, "4ea39266-7211-409f-b622-f63dbd16c533")
2046 +DECLARE_INTERFACE_(IThumbnailCapture, IUnknown)
2047 {
2048 // *** IThumbnailCapture methods ***
2049 STDMETHOD (CaptureThumbnail) ( THIS_ const SIZE * pMaxSize,
2050 @@ -1856,9 +1893,10 @@
2051 #include <poppack.h> /* Return to byte packing */
2052
2053 #undef INTERFACE
2054 +EXTERN_C const IID IID_IEnumShellImageStore;
2055 #define INTERFACE IEnumShellImageStore
2056
2057 -DECLARE_INTERFACE_IID_( IEnumShellImageStore, IUnknown, "6DFD582B-92E3-11D1-98A3-00C04FB687DA" )
2058 +DECLARE_INTERFACE_( IEnumShellImageStore, IUnknown)
2059 {
2060 STDMETHOD ( QueryInterface ) ( THIS_ REFIID riid, void **ppv ) PURE;
2061 STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
2062 @@ -1878,11 +1916,12 @@
2063 #define SHIMSTCAPFLAG_PURGEABLE 0x0002 // does the store require dead items purging externally ?
2064
2065 #undef INTERFACE
2066 +EXTERN_C const IID IID_IShellImageStore;
2067 #define INTERFACE IShellImageStore
2068
2069 // this interface is used to manipulate the Image cache. It can potentially be used
2070 // in a free threaded manner in conjunction with the Lock parameter to Open and close
2071 -DECLARE_INTERFACE_IID_( IShellImageStore, IUnknown, "48C8118C-B924-11D1-98D5-00C04FB687DA" )
2072 +DECLARE_INTERFACE_( IShellImageStore, IUnknown)
2073 {
2074 STDMETHOD ( QueryInterface )( THIS_ REFIID riid, void **ppv ) PURE;
2075 STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
2076 @@ -1961,9 +2000,10 @@
2077 #include <poppack.h> /* Return to byte packing */
2078
2079 #undef INTERFACE
2080 +EXTERN_C const IID IID_IShellFolderBand;
2081 #define INTERFACE IShellFolderBand
2082
2083 -DECLARE_INTERFACE_IID_(IShellFolderBand, IUnknown, "7FE80CC8-C247-11d0-B93A-00A0C90312E1")
2084 +DECLARE_INTERFACE_(IShellFolderBand, IUnknown)
2085 {
2086 // *** IUnknown methods ***
2087 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
2088 @@ -1984,9 +2024,10 @@
2089 //// IDeskBarClient
2090
2091 #undef INTERFACE
2092 +EXTERN_C const IID IID_IDeskBarClient;
2093 #define INTERFACE IDeskBarClient
2094
2095 -DECLARE_INTERFACE_IID_(IDeskBarClient, IOleWindow, "EB0FE175-1A3A-11D0-89B3-00A0C90A90AC")
2096 +DECLARE_INTERFACE_(IDeskBarClient, IOleWindow)
2097 {
2098 // *** IUnknown methods ***
2099 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
2100 @@ -2238,9 +2279,10 @@
2101 //
2102
2103 #undef INTERFACE
2104 +EXTERN_C const IID IID_IActiveDesktop;
2105 #define INTERFACE IActiveDesktop
2106
2107 -DECLARE_INTERFACE_IID_(IActiveDesktop, IUnknown, "f490eb00-1240-11d1-9888-006097deacf9")
2108 +DECLARE_INTERFACE_(IActiveDesktop, IUnknown)
2109 {
2110 // IUnknown methods
2111 STDMETHOD (QueryInterface)(THIS_ REFIID riid, __out void **ppv) PURE;
2112 @@ -2288,9 +2330,10 @@
2113 #define SCHEME_CREATE 0x0080
2114
2115 #undef INTERFACE
2116 +EXTERN_C const IID IID_IActiveDesktopP;
2117 #define INTERFACE IActiveDesktopP
2118
2119 -DECLARE_INTERFACE_IID_(IActiveDesktopP, IUnknown, "52502EE0-EC80-11D0-89AB-00C04FC2972D")
2120 +DECLARE_INTERFACE_(IActiveDesktopP, IUnknown)
2121 {
2122 // IUnknown methods
2123 STDMETHOD (QueryInterface)(THIS_ REFIID riid, __out void **ppv) PURE;
2124 @@ -2311,9 +2354,10 @@
2125 #define GADOF_DIRTY 0x00000001
2126
2127 #undef INTERFACE
2128 +EXTERN_C const IID IID_IADesktopP2;
2129 #define INTERFACE IADesktopP2
2130
2131 -DECLARE_INTERFACE_IID_(IADesktopP2, IUnknown, "B22754E2-4574-11d1-9888-006097DEACF9")
2132 +DECLARE_INTERFACE_(IADesktopP2, IUnknown)
2133 {
2134 // IUnknown methods
2135 STDMETHOD (QueryInterface)(THIS_ REFIID riid, __out void **ppv) PURE;
2136 @@ -2375,11 +2419,12 @@
2137 #include <poppack.h> /* Return to byte packing */
2138
2139 #undef INTERFACE
2140 +EXTERN_C const IID IID_IColumnProvider;
2141 #define INTERFACE IColumnProvider
2142
2143 // Note: these objects must be threadsafe! GetItemData _will_ be called
2144 // simultaneously from multiple threads.
2145 -DECLARE_INTERFACE_IID_(IColumnProvider, IUnknown, "E8025004-1C42-11d2-BE2C-00A0C9A83DA1")
2146 +DECLARE_INTERFACE_(IColumnProvider, IUnknown)
2147 {
2148 // IUnknown methods
2149 STDMETHOD (QueryInterface)(THIS_ REFIID riid, __out void **ppv) PURE;
2150 @@ -2698,9 +2743,10 @@
2151 // IShellChangeNotify
2152 //
2153 #undef INTERFACE
2154 +EXTERN_C const IID IID_IShellChangeNotify;
2155 #define INTERFACE IShellChangeNotify
2156
2157 -DECLARE_INTERFACE_IID_(IShellChangeNotify, IUnknown, "D82BE2B1-5764-11D0-A96E-00C04FD705A2")
2158 +DECLARE_INTERFACE_(IShellChangeNotify, IUnknown)
2159 {
2160 // *** IUnknown methods ***
2161 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
2162 @@ -2723,9 +2769,10 @@
2163 //-------------------------------------------------------------------------
2164
2165 #undef INTERFACE
2166 +EXTERN_C const IID IID_IQueryInfo;
2167 #define INTERFACE IQueryInfo
2168
2169 -DECLARE_INTERFACE_IID_(IQueryInfo, IUnknown, "00021500-0000-0000-c000-000000000046")
2170 +DECLARE_INTERFACE_(IQueryInfo, IUnknown)
2171 {
2172 // *** IUnknown methods ***
2173 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
2174 @@ -3117,7 +3164,7 @@
2175 SHSTDAPI_(BOOL) ILIsEqual(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2);
2176 SHSTDAPI_(BOOL) ILIsParent(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2, BOOL fImmediate);
2177 SHSTDAPI ILSaveToStream(__in IStream *pstm, __in PCUIDLIST_RELATIVE pidl);
2178 -DECLSPEC_DEPRECATED SHSTDAPI ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl);
2179 +//SHSTDAPI ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl);
2180 SHSTDAPI ILLoadFromStreamEx(__in IStream *pstm, __deref_out PIDLIST_RELATIVE *pidl);
2181
2182 #if (_WIN32_IE >= 0x0400)
2183 @@ -3188,8 +3235,9 @@
2184
2185 #if (NTDDI_VERSION >= NTDDI_WIN2K && NTDDI_VERSION < NTDDI_VISTA)
2186 #undef INTERFACE
2187 +EXTERN_C const IID IID_IDefViewFrame;
2188 #define INTERFACE IDefViewFrame
2189 -DECLARE_INTERFACE_IID_(IDefViewFrame, IUnknown, "710EB7A0-45ED-11D0-924A-0020AFC7AC4D")
2190 +DECLARE_INTERFACE_(IDefViewFrame, IUnknown)
2191 {
2192 // *** IUnknown methods ***
2193 STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
2194 @@ -3522,8 +3570,9 @@
2195 // IDocViewSite
2196 //
2197 #undef INTERFACE
2198 +EXTERN_C const IID IID_IDocViewSite;
2199 #define INTERFACE IDocViewSite
2200 -DECLARE_INTERFACE_IID_(IDocViewSite, IUnknown, "87D605E0-C511-11CF-89A9-00A0C9054129")
2201 +DECLARE_INTERFACE_(IDocViewSite, IUnknown)
2202 {
2203 // *** IUnknown methods ***
2204 STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppv) PURE;
2205 @@ -3588,9 +3637,10 @@
2206 SHSTDAPI_(BOOL) IsUserAnAdmin(void);
2207
2208 #undef INTERFACE
2209 +EXTERN_C const IID IID_IInitializeObject;
2210 #define INTERFACE IInitializeObject
2211
2212 -DECLARE_INTERFACE_IID_(IInitializeObject, IUnknown, "4622AD16-FF23-11d0-8D34-00A0C90F2719")
2213 +DECLARE_INTERFACE_(IInitializeObject, IUnknown)
2214 {
2215 // *** IUnknown methods ***
2216 STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
2217 @@ -3609,9 +3659,10 @@
2218 };
2219
2220 #undef INTERFACE
2221 +EXTERN_C const IID IID_IBanneredBar;
2222 #define INTERFACE IBanneredBar
2223
2224 -DECLARE_INTERFACE_IID_(IBanneredBar, IUnknown, "596A9A94-013E-11d1-8D34-00A0C90F2719")
2225 +DECLARE_INTERFACE_(IBanneredBar, IUnknown)
2226 {
2227 // *** IUnknown methods ***
2228 STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
2229 @@ -3633,9 +3684,10 @@
2230
2231 //
2232 #undef INTERFACE
2233 +EXTERN_C const IID IID_IShellFolderViewCB;
2234 #define INTERFACE IShellFolderViewCB
2235
2236 -DECLARE_INTERFACE_IID_(IShellFolderViewCB, IUnknown, "2047E320-F2A9-11CE-AE65-08002B2E1262")
2237 +DECLARE_INTERFACE_(IShellFolderViewCB, IUnknown)
2238 {
2239 // *** IUnknown methods ***
2240 STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
2241 @@ -3774,9 +3826,10 @@
2242 #define SFVS_SELECT_INVERT 0x2 // Inver the selection
2243
2244 #undef INTERFACE
2245 +EXTERN_C const IID IID_IShellFolderView;
2246 #define INTERFACE IShellFolderView
2247
2248 -DECLARE_INTERFACE_IID_(IShellFolderView, IUnknown, "37A378C0-F82D-11CE-AE65-08002B2E1262")
2249 +DECLARE_INTERFACE_(IShellFolderView, IUnknown)
2250 {
2251 // *** IUnknown methods ***
2252 STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
2253 @@ -4358,8 +4411,9 @@
2254 //
2255 //--------------------------------------------------------------------------
2256 #undef INTERFACE
2257 +EXTERN_C const IID IID_INamedPropertyBag;
2258 #define INTERFACE INamedPropertyBag
2259 -DECLARE_INTERFACE_IID_(INamedPropertyBag, IUnknown, "FB700430-952C-11d1-946F-000000000000")
2260 +DECLARE_INTERFACE_(INamedPropertyBag, IUnknown)
2261 {
2262 // *** IUnknown methods ***
2263 STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
2264 @@ -4578,5 +4632,9 @@
2265 #endif
2266 #endif
2267
2268 +#undef __in
2269 +#undef __out
2270 +#undef __inline
2271 +
2272 #endif /* _SHLOBJ_H_ */
2273
2274 --- include/shobjidl.h.orig 2008-01-18 22:17:36.000000000 +0900
2275 +++ include/shobjidl.h 2009-02-16 21:34:39.065125000 +0900
2276 @@ -1,3 +1,6 @@
2277 +#if __GNUC__ >=3
2278 +#pragma GCC system_header
2279 +#endif
2280
2281
2282 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
2283 @@ -1667,6 +1670,14 @@
2284 #include "prsht.h"
2285 #include "propsys.h"
2286
2287 +#define __in
2288 +#define __out
2289 +#ifdef __cplusplus
2290 +#define __inline inline
2291 +#else
2292 +#define __inline static __inline__
2293 +#endif
2294 +
2295 #ifdef __cplusplus
2296 extern "C"{
2297 #endif
2298 @@ -6384,7 +6395,6 @@
2299
2300 typedef ICommDlgBrowser2 *LPCOMMDLGBROWSER2;
2301
2302 -#endif // NTDDI_WIN2K
2303 #if (_WIN32_IE >= _WIN32_IE_IE70)
2304
2305
2306 @@ -6727,6 +6737,7 @@
2307 /* [local] */
2308
2309 #endif // (_WIN32_IE >= _WIN32_IE_IE70)
2310 +#endif // NTDDI_WIN2K
2311
2312
2313 extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0026_v0_0_c_ifspec;
2314 @@ -7323,6 +7334,7 @@
2315 #define FCT_MERGE 0x0001
2316 #define FCT_CONFIGABLE 0x0002
2317 #define FCT_ADDTOEND 0x0004
2318 +
2319 #ifdef _NEVER_
2320 typedef LPARAM LPTBBUTTONSB;
2321
2322 @@ -7331,6 +7343,13 @@
2323 typedef LPTBBUTTON LPTBBUTTONSB;
2324 #endif //_NEVER_
2325
2326 +#define __in
2327 +#define __out
2328 +#ifdef __cplusplus
2329 +#define __inline inline
2330 +#else
2331 +#define __inline static __inline__
2332 +#endif
2333
2334 extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_c_ifspec;
2335 extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_s_ifspec;
2336 @@ -29000,6 +29019,10 @@
2337 }
2338 #endif
2339
2340 +#undef __in
2341 +#undef __out
2342 +#undef __inline
2343 +
2344 #endif
2345
2346
2347 --- include/shtypes.h.orig 2006-12-30 18:12:26.093750000 +0900
2348 +++ include/shtypes.h 2006-12-30 18:24:10.953125000 +0900
2349 @@ -1,3 +1,6 @@
2350 +#if __GNUC__ >=3
2351 +#pragma GCC system_header
2352 +#endif
2353
2354
2355 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
2356 @@ -137,7 +140,7 @@
2357
2358 #endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)
2359 #include <poppack.h>
2360 -typedef /* [unique] */ __RPC_unique_pointer BYTE_BLOB *wirePIDL;
2361 +//typedef /* [unique] */ __RPC_unique_pointer BYTE_BLOB *wirePIDL;
2362
2363 typedef /* [wire_marshal] */ ITEMIDLIST __unaligned *LPITEMIDLIST;
2364
2365 --- include/specstrings.h.orig 2008-01-18 22:17:38.000000000 +0900
2366 +++ include/specstrings.h 2009-02-16 21:34:39.065125000 +0900
2367 @@ -6,7 +6,106 @@
2368 #if _MSC_VER
2369 #pragma once
2370 #endif
2371 -#include <sal.h>
2372 +//#include <sal.h>
2373 +#define __RPC__deref_in_ecount_full_opt(x)
2374 +#define __RPC__deref_inout_opt
2375 +#define __RPC__deref_opt_inout_opt
2376 +#define __RPC__deref_opt_inout_ecount_full_opt(x)
2377 +#define __RPC__deref_out
2378 +#define __RPC__deref_out_ecount_full_opt(x)
2379 +#define __RPC__deref_out_opt
2380 +#define __RPC__deref_out_opt_string
2381 +#define __RPC__in
2382 +#define __RPC__in_ecount_full(x)
2383 +#define __RPC__in_ecount_full_opt(x)
2384 +#define __RPC__in_opt
2385 +#define __RPC__inout
2386 +#define __RPC__inout_ecount_full(x)
2387 +#define __RPC__inout_ecount_full_opt(x)
2388 +#define __RPC__inout_opt
2389 +#define __RPC__out
2390 +#define __RPC__out_ecount_full(x)
2391 +#define __RPC__out_ecount_full_string(x)
2392 +#define __RPC__out_ecount_part(x,y)
2393 +#define __RPC_unique_pointer
2394 +#define __callback
2395 +#define __inner_checkReturn
2396 +#define __inner_control_entrypoint(x)
2397 +#define __control_entrypoint(x)
2398 +#define __data_entrypoint(x)
2399 +#define __deref
2400 +#define __deref_inout
2401 +#define __deref_inout_ecount_z(x)
2402 +#define __deref_inout_opt
2403 +#define __deref_opt_inout_bcount_part_opt(x,y)
2404 +#define __deref_opt_inout_opt
2405 +#define __deref_opt_out
2406 +#define __deref_opt_out_bcount(x)
2407 +#define __deref_opt_out_ecount(x)
2408 +#define __deref_opt_out_opt
2409 +#define __deref_out
2410 +#define __deref_out_bcount(x)
2411 +#define __deref_out_bcount_opt(x)
2412 +#define __deref_out_ecount(x)
2413 +#define __deref_out_ecount_opt(x)
2414 +#define __deref_out_ecount_part(x,y)
2415 +#define __deref_out_opt
2416 +#define __deref_out_z
2417 +#define __deref_out_z_opt
2418 +#define __format_string
2419 +#define __in
2420 +#define __in_bcount(x)
2421 +#define __in_bcount_opt(x)
2422 +#define __in_ecount(x)
2423 +#define __in_ecount_opt(x)
2424 +#define __in_opt
2425 +#define __in_z
2426 +#define __in_z_opt
2427 +#define __inout
2428 +#define __inout_bcount(x)
2429 +#define __inout_bcount_full(x)
2430 +#define __inout_bcount_opt(x)
2431 +#define __inout_bcount_part(x,y)
2432 +#define __inout_bcount_part_opt(x,y)
2433 +#define __inout_ecount(x)
2434 +#define __inout_ecount_opt(x)
2435 +#define __inout_opt
2436 +#define __nullnullterminated
2437 +#define __nullterminated
2438 +#define __out
2439 +#define __out_bcount(x)
2440 +#define __out_bcount_full(x)
2441 +#define __out_bcount_opt(x)
2442 +#define __out_bcount_part(x,y)
2443 +#define __out_bcount_part_opt(x,y)
2444 +#define __out_ecount(x)
2445 +#define __out_ecount_full(x)
2446 +#define __out_ecount_opt(x)
2447 +#define __out_ecount_part(x,y)
2448 +#define __out_ecount_part_opt(x,y)
2449 +#define __out_opt
2450 +#define __out_xcount(x)
2451 +#define __out_xcount_opt(x)
2452 +#define __reserved
2453 +#define __success(x)
2454 +#define __typefix(x)
2455 +#define __post
2456 +#define __deref
2457 +#define __pre
2458 +#define __exceptthat
2459 +#define __notnull
2460 +#define __maybenull
2461 +#define __byte_writableTo(x)
2462 +#define __valid
2463 +#define __refparam
2464 +#define __elem_writableTo(x)
2465 +#ifdef __cplusplus
2466 +#define __forceinline inline
2467 +#define __inline inline
2468 +#else
2469 +#define __forceinline static __inline__
2470 +#define __inline static __inline__
2471 +#endif
2472
2473 #ifndef __SAL_H_FULL_VER
2474 #define __SAL_H_FULL_VER 140050727
2475 --- include/sspi.h.orig 2008-03-22 06:10:42.631375000 +1000
2476 +++ include/sspi.h 2009-02-16 21:34:39.065125000 +0900
2477 @@ -20,6 +20,14 @@
2478 #define __SSPI_H__
2479 // end_ntifs
2480
2481 +#define __in
2482 +#define __out
2483 +#ifdef __cplusplus
2484 +#define __inline inline
2485 +#else
2486 +#define __inline static __inline__
2487 +#endif
2488 +
2489 #if _MSC_VER > 1000
2490 #pragma once
2491 #endif
2492 @@ -2154,8 +2162,7 @@
2493
2494 // begin_ntifs
2495
2496 -#ifndef _AUTH_IDENTITY_DEFINED
2497 -#define _AUTH_IDENTITY_DEFINED
2498 +#ifndef SEC_WINNT_AUTH_IDENTITY_ANSI
2499
2500 //
2501 // This was not defined in NTIFS.h for windows 2000 however
2502 @@ -2326,6 +2333,10 @@
2503 } // extern "C"
2504 #endif
2505
2506 +#undef __in
2507 +#undef __out
2508 +#undef __inline
2509 +
2510 // begin_ntifs
2511 #endif // __SSPI_H__
2512 // end_ntifs
2513 --- include/strmif.h.orig 2008-01-18 22:17:38.000000000 +0900
2514 +++ include/strmif.h 2009-02-16 21:34:39.065125000 +0900
2515 @@ -1,3 +1,6 @@
2516 +#if __GNUC__ >=3
2517 +#pragma GCC system_header
2518 +#endif
2519
2520
2521 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
2522 @@ -888,6 +891,14 @@
2523 #include "oaidl.h"
2524 #include "ocidl.h"
2525
2526 +#define __in
2527 +#define __out
2528 +#ifdef __cplusplus
2529 +#define __inline inline
2530 +#else
2531 +#define __inline static __inline__
2532 +#endif
2533 +
2534 #ifdef __cplusplus
2535 extern "C"{
2536 #endif
2537 @@ -16250,7 +16261,7 @@
2538 #define _IAMFilterGraphCallback_
2539 // Note: Because this interface was not defined as a proper interface it is
2540 // supported under C++ only. Methods aren't stdcall.
2541 -EXTERN_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70);
2542 +DEFINE_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70);
2543 interface IAMFilterGraphCallback : public IUnknown
2544 {
2545 // S_OK means rendering complete, S_FALSE means retry now.
2546 @@ -21934,7 +21945,7 @@
2547 typedef struct tagVMRGUID
2548 {
2549 GUID *pGUID;
2550 - GUID GUID;
2551 + GUID aGUID;
2552 } VMRGUID;
2553
2554 typedef struct tagVMRMONITORINFO
2555 @@ -23341,6 +23352,10 @@
2556 }
2557 #endif
2558
2559 +#undef __in
2560 +#undef __out
2561 +#undef __inline
2562 +
2563 #endif
2564
2565
2566 --- include/strsafe.h.orig 2008-01-18 22:17:38.000000000 +0900
2567 +++ include/strsafe.h 2009-02-16 21:34:39.065125000 +0900
2568 @@ -13,12 +13,23 @@
2569 #if (_MSC_VER > 1000)
2570 #pragma once
2571 #endif
2572 +#if __GNUC__ >=3
2573 +#pragma GCC system_header
2574 +#endif
2575
2576 #include <stdio.h> // for _vsnprintf, _vsnwprintf, getc, getwc
2577 #include <string.h> // for memset
2578 #include <stdarg.h> // for va_start, etc.
2579 #include <specstrings.h> // for __in, etc.
2580
2581 +#define __in
2582 +#define __out
2583 +#ifdef __cplusplus
2584 +#define __inline inline
2585 +#else
2586 +#define __inline static __inline__
2587 +#endif
2588 +
2589 #if !defined(_W64)
2590 #if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && (_MSC_VER >= 1300)
2591 #define _W64 __w64
2592 @@ -9254,7 +9265,7 @@
2593 wchar_t ch = getwc(stdin);
2594 // ASSERT(sizeof(wchar_t) == sizeof(wint_t));
2595
2596 - if (ch == WEOF)
2597 + if (ch == 0xffff)
2598 {
2599 if (cchNewDestLength == 0)
2600 {
2601 @@ -9763,5 +9774,9 @@
2602
2603 #pragma warning(pop)
2604
2605 +#undef __in
2606 +#undef __out
2607 +#undef __inline
2608 +
2609 #endif // _STRSAFE_H_INCLUDED_
2610
2611 --- include/structuredquery.h.orig 2008-03-22 06:10:42.756375000 +1000
2612 +++ include/structuredquery.h 2009-02-16 21:34:39.065125000 +0900
2613 @@ -233,6 +233,14 @@
2614 #include "ocidl.h"
2615 #include "propidl.h"
2616
2617 +#define __in
2618 +#define __out
2619 +#ifdef __cplusplus
2620 +#define __inline inline
2621 +#else
2622 +#define __inline static __inline__
2623 +#endif
2624 +
2625 #ifdef __cplusplus
2626 extern "C"{
2627 #endif
2628 @@ -2472,6 +2480,10 @@
2629 }
2630 #endif
2631
2632 +#undef __in
2633 +#undef __out
2634 +#undef __inline
2635 +
2636 #endif
2637
2638
2639 --- include/urlmon.h.orig 2008-03-22 06:10:42.818875000 +1000
2640 +++ include/urlmon.h 2009-02-16 21:34:39.065125000 +0900
2641 @@ -1,3 +1,6 @@
2642 +#if __GNUC__ >=3
2643 +#pragma GCC system_header
2644 +#endif
2645
2646
2647 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
2648 @@ -330,6 +333,14 @@
2649 #include "servprov.h"
2650 #include "msxml.h"
2651
2652 +#define __in
2653 +#define __out
2654 +#ifdef __cplusplus
2655 +#define __inline inline
2656 +#else
2657 +#define __inline static __inline__
2658 +#endif
2659 +
2660 #ifdef __cplusplus
2661 extern "C"{
2662 #endif
2663 @@ -8880,6 +8891,10 @@
2664 }
2665 #endif
2666
2667 +#undef __in
2668 +#undef __out
2669 +#undef __inline
2670 +
2671 #endif
2672
2673
2674 --- include/wincrypt.h.orig 2008-01-18 22:17:42.000000000 +0900
2675 +++ include/wincrypt.h 2009-02-16 21:34:39.065125000 +0900
2676 @@ -14,6 +14,14 @@
2677
2678 #include <specstrings.h> /* for SAL annotations */
2679
2680 +#define __in
2681 +#define __out
2682 +#ifdef __cplusplus
2683 +#define __inline inline
2684 +#else
2685 +#define __inline static __inline__
2686 +#endif
2687 +
2688 #if defined (_MSC_VER)
2689
2690 #if ( _MSC_VER >= 800 )
2691 @@ -1927,6 +1935,14 @@
2692 #include <bcrypt.h>
2693 #include <ncrypt.h>
2694
2695 +#define __in
2696 +#define __out
2697 +#ifdef __cplusplus
2698 +#define __inline inline
2699 +#else
2700 +#define __inline static __inline__
2701 +#endif
2702 +
2703 // This type is used when the API can take either the CAPI1 HCRYPTPROV or
2704 // the CNG NCRYPT_KEY_HANDLE. Where appropriate, the HCRYPTPROV will be
2705 // converted to a NCRYPT_KEY_HANDLE via the CNG NCryptTranslateHandle().
2706 @@ -17113,8 +17129,8 @@
2707 __in DWORD dwFlags,
2708 __in_opt PCRYPT_KEY_PROV_INFO pKeyProvInfo,
2709 __in_opt PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
2710 - __in_opt PSYSTEMTIME pStartTime,
2711 - __in_opt PSYSTEMTIME pEndTime,
2712 + __in_opt LPSYSTEMTIME pStartTime,
2713 + __in_opt LPSYSTEMTIME pEndTime,
2714 __in_opt PCERT_EXTENSIONS pExtensions
2715 );
2716
2717 @@ -19174,6 +19190,10 @@
2718 #endif
2719 #endif
2720
2721 +#undef __in
2722 +#undef __out
2723 +#undef __inline
2724 +
2725 #endif // __WINCRYPT_H__
2726
2727
2728 --- include/winerror.h.orig 2008-03-20 13:39:15.127375000 +0900
2729 +++ include/winerror.h 2008-03-20 14:33:29.097125000 +0900
2730 @@ -23065,7 +23065,7 @@
2731
2732 #if !defined(_HRESULT_DEFINED) && !defined(__midl)
2733 #define _HRESULT_DEFINED
2734 -typedef __success(return >= 0) long HRESULT;
2735 +typedef long HRESULT;
2736 #endif
2737
2738 #ifndef __midl
2739 --- include/wingdi.h.orig 2008-03-22 06:10:42.897000000 +1000
2740 +++ include/wingdi.h 2009-02-16 21:34:39.065125000 +0900
2741 @@ -9,6 +9,13 @@
2742 #ifndef _WINGDI_
2743 #define _WINGDI_
2744
2745 +#define __in
2746 +#define __out
2747 +#ifdef __cplusplus
2748 +#define __inline inline
2749 +#else
2750 +#define __inline static __inline__
2751 +#endif
2752
2753 #pragma once
2754
2755 @@ -1169,11 +1176,10 @@
2756 typedef struct tagLOGPALETTE {
2757 WORD palVersion;
2758 WORD palNumEntries;
2759 - __field_ecount_opt(palNumEntries) PALETTEENTRY palPalEntry[1];
2760 + __field_ecount_opt(palNumEntries) PALETTEENTRY palPalEntry[1];
2761 } LOGPALETTE, *PLOGPALETTE, NEAR *NPLOGPALETTE, FAR *LPLOGPALETTE;
2762 #endif // !_LOGPALETTE_DEFINED
2763
2764 -
2765 /* Logical Font */
2766 #define LF_FACESIZE 32
2767
2768 @@ -1901,7 +1907,7 @@
2769 /* size of a form name string */
2770 #define CCHFORMNAME 32
2771
2772 -#if (_WIN32_WINNT >= ((OSVER(NTDDI_WINXPSP2)) >> 16))
2773 +#if (_WIN32_WINNT >= ((NTDDI_WINXPSP2 & 0xFFFF0000) >> 16))
2774 typedef struct _devicemodeA {
2775 BYTE dmDeviceName[CCHDEVICENAME];
2776 WORD dmSpecVersion;
2777 @@ -2900,7 +2906,7 @@
2778 typedef FARPROC LINEDDAPROC;
2779 #endif
2780
2781 -
2782 +WINGDIAPI int WINAPI FillRect(HDC,LPCRECT,HBRUSH);
2783
2784 WINGDIAPI int WINAPI AddFontResourceA(__in LPCSTR);
2785 WINGDIAPI int WINAPI AddFontResourceW(__in LPCWSTR);
2786 @@ -3254,7 +3260,7 @@
2787 WINGDIAPI int WINAPI GetDeviceCaps( __in_opt HDC hdc, __in int index);
2788 WINGDIAPI int WINAPI GetDIBits( __in HDC hdc, __in HBITMAP hbm, __in UINT start, __in UINT cLines, __out_opt LPVOID lpvBits, __inout_xcount(sizeof(BITMAPINFOHEADER)) LPBITMAPINFO lpbmi, __in UINT usage); // SAL actual size of lpbmi is computed from structure elements
2789
2790 -__success(return != GDI_ERROR)
2791 +//__success(return != GDI_ERROR)
2792 WINGDIAPI DWORD WINAPI GetFontData ( __in HDC hdc,
2793 __in DWORD dwTable,
2794 __in DWORD dwOffset,
2795 @@ -4346,6 +4352,7 @@
2796 WINGDIAPI BOOL WINAPI ColorCorrectPalette( __in HDC hdc, __in HPALETTE hPal, __in DWORD deFirst, __in DWORD num);
2797 #endif
2798
2799 +
2800 #ifndef NOMETAFILE
2801
2802 // Enhanced metafile constants.
2803 @@ -5424,6 +5431,10 @@
2804 }
2805 #endif
2806
2807 +#undef __in
2808 +#undef __out
2809 +#undef __inline
2810 +
2811 #endif /* _WINGDI_ */
2812
2813
2814 --- include/winsock2.h.orig 2008-03-22 06:10:42.912625000 +1000
2815 +++ include/winsock2.h 2009-02-16 21:34:39.065125000 +0900
2816 @@ -1,3 +1,6 @@
2817 +#if __GNUC__ >=3
2818 +#pragma GCC system_header
2819 +#endif
2820 //$TAG BIZDEV
2821 // $IPCategory:
2822 // $DealPointID: 118736
2823 @@ -24,9 +27,9 @@
2824 * conditions for redistribution.
2825 */
2826
2827 -#ifndef _WINSOCK2API_
2828 -#define _WINSOCK2API_
2829 -#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
2830 +#ifndef _WINSOCK2_H
2831 +#define _WINSOCK2_H
2832 +#define _WINSOCK_H /* to prevent later inclusion of winsock.h */
2833
2834 #pragma once
2835
2836 @@ -66,6 +69,14 @@
2837 #include <windows.h>
2838 #endif /* _INC_WINDOWS */
2839
2840 +#define __in
2841 +#define __out
2842 +#ifdef __cplusplus
2843 +#define __inline inline
2844 +#else
2845 +#define __inline static __inline__
2846 +#endif
2847 +
2848 /*
2849 * Define the current Winsock version. To build an earlier Winsock version
2850 * application redefine this value prior to including Winsock2.h.
2851 @@ -1107,10 +1118,8 @@
2852 * registration (RNR) API
2853 */
2854
2855 -#ifndef _tagBLOB_DEFINED
2856 -#define _tagBLOB_DEFINED
2857 -#define _BLOB_DEFINED
2858 -#define _LPBLOB_DEFINED
2859 +#ifndef __BLOB_T_DEFINED
2860 +#define __BLOB_T_DEFINED
2861 typedef struct _BLOB {
2862 ULONG cbSize ;
2863 #ifdef MIDL_PASS
2864 @@ -3920,5 +3929,9 @@
2865 #endif // IPV6STRICT
2866 #endif //(_WIN32_WINNT >= 0x0501)
2867
2868 -#endif /* _WINSOCK2API_ */
2869 +#undef __in
2870 +#undef __out
2871 +#undef __inline
2872 +
2873 +#endif /* _WINSOCK2_H */
2874
2875
2876 --- include/winuser.h.orig 2008-07-19 14:56:51.278750000 +0900
2877 +++ include/winuser.h 2009-02-16 21:34:39.065125000 +0900
2878 @@ -11,6 +11,15 @@
2879 #ifndef _WINUSER_
2880 #define _WINUSER_
2881
2882 +#define __in
2883 +#define __out
2884 +#ifdef __cplusplus
2885 +#define __inline inline
2886 +#else
2887 +#define __inline static __inline__
2888 +#endif
2889 +DECLARE_HANDLE(HHOOK);
2890 +typedef CONST GUID *LPCGUID;
2891
2892
2893 #pragma once
2894 @@ -39,7 +48,7 @@
2895 #define WINVER 0x0500 /* version 5.0 */
2896 #endif /* !WINVER */
2897
2898 -#include <stdarg.h>
2899 +#include <../include/stdarg.h>
2900
2901 #ifndef NOUSER
2902
2903 @@ -215,6 +224,8 @@
2904 #pragma warning(disable:4995)
2905 #endif
2906
2907 +WINUSERAPI UINT WINAPI WinExec(LPCSTR,UINT);
2908 +
2909 WINUSERAPI
2910 int
2911 WINAPI
2912 @@ -10717,7 +10728,7 @@
2913 #define CDS_RESET 0x40000000
2914 #define CDS_NORESET 0x10000000
2915
2916 -#include <tvout.h>
2917 +//#include <tvout.h>
2918
2919 /* Return values for ChangeDisplaySettings */
2920 #define DISP_CHANGE_SUCCESSFUL 0
2921 @@ -12571,16 +12582,20 @@
2922
2923
2924
2925 -#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
2926 -#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
2927 -#include "winuser.inl"
2928 -#endif /* ISOLATION_AWARE_ENABLED */
2929 -#endif /* RC */
2930 +//#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
2931 +//#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
2932 +//#include "winuser.inl"
2933 +//#endif /* ISOLATION_AWARE_ENABLED */
2934 +//#endif /* RC */
2935
2936 #ifdef __cplusplus
2937 }
2938 #endif /* __cplusplus */
2939
2940 +#undef __in
2941 +#undef __out
2942 +#undef __inline
2943 +
2944 #endif /* !_WINUSER_ */
2945
2946
2947 --- include/ws2ipdef.h.orig 2008-01-18 22:17:44.000000000 +0900
2948 +++ include/ws2ipdef.h 2009-02-16 21:34:39.065125000 +0900
2949 @@ -1,3 +1,6 @@
2950 +#if __GNUC__ >=3
2951 +#pragma GCC system_header
2952 +#endif
2953 /*++
2954
2955 Copyright (c) Microsoft Corporation. All rights reserved.
2956 @@ -52,10 +55,10 @@
2957 #define WS2IPDEF_ASSERT(exp) ((VOID) 0)
2958 #endif
2959
2960 -#ifdef _MSC_VER
2961 -#define WS2TCPIP_INLINE __inline
2962 +#ifdef __cplusplus
2963 +#define WS2TCPIP_INLINE inline
2964 #else
2965 -#define WS2TCPIP_INLINE extern inline /* GNU style */
2966 +#define WS2TCPIP_INLINE static __inline__
2967 #endif
2968
2969 #include <in6addr.h>
2970 @@ -760,7 +763,7 @@
2971 ULONG ipv6mr_interface; // Interface index.
2972 } IPV6_MREQ, *PIPV6_MREQ;
2973
2974 -#if (NTDDI_VERSION >= NTDDI_WINXP)
2975 +#if 0
2976 //
2977 // Structure for GROUP_REQ used by protocol independent source filters
2978 // (MCAST_JOIN_GROUP and MCAST_LEAVE_GROUP).
2979 @@ -805,6 +808,8 @@
2980 ULONG ipi_ifindex; // Send/receive interface index.
2981 } IN_PKTINFO, *PIN_PKTINFO;
2982
2983 +#define C_ASSERT(x)
2984 +
2985 C_ASSERT(sizeof(IN_PKTINFO) == 8);
2986
2987 //
2988 --- include/ws2tcpip.h.orig 2008-01-18 22:17:44.000000000 +0900
2989 +++ include/ws2tcpip.h 2009-02-16 21:34:39.065125000 +0900
2990 @@ -18,6 +18,9 @@
2991
2992 #ifndef _WS2TCPIP_H_
2993 #define _WS2TCPIP_H_
2994 +#if __GNUC__ >=3
2995 +#pragma GCC system_header
2996 +#endif
2997
2998 #if _MSC_VER > 1000
2999 #pragma once
3000 @@ -27,15 +30,23 @@
3001 #include <ws2ipdef.h>
3002 #include <limits.h>
3003
3004 +#define __in
3005 +#define __out
3006 +#ifdef __cplusplus
3007 +#define __inline inline
3008 +#else
3009 +#define __inline static __inline__
3010 +#endif
3011 +
3012 /* Option to use with [gs]etsockopt at the IPPROTO_UDP level */
3013
3014 #define UDP_NOCHECKSUM 1
3015 #define UDP_CHECKSUM_COVERAGE 20 /* Set/get UDP-Lite checksum coverage */
3016
3017 -#ifdef _MSC_VER
3018 -#define WS2TCPIP_INLINE __inline
3019 +#ifdef __cplusplus
3020 +#define WS2TCPIP_INLINE inline
3021 #else
3022 -#define WS2TCPIP_INLINE extern inline /* GNU style */
3023 +#define WS2TCPIP_INLINE static __inline__
3024 #endif
3025
3026 /* Error codes from getaddrinfo() */
3027 @@ -835,7 +846,7 @@
3028 return Error;
3029 }
3030
3031 -#if (NTDDI_VERSION >= NTDDI_WINXP)
3032 +#if 0
3033 WS2TCPIP_INLINE
3034 int
3035 setsourcefilter(
3036 @@ -1056,5 +1067,9 @@
3037 #include <wspiapi.h>
3038 #endif
3039
3040 +#undef __in
3041 +#undef __out
3042 +#undef __inline
3043 +
3044 #endif /* _WS2TCPIP_H_ */
3045
3046 --- include/wspiapi.h.orig 2005-04-14 17:55:04.000000000 +0900
3047 +++ include/wspiapi.h 2009-02-16 21:34:39.065125000 +0900
3048 @@ -15,6 +15,9 @@
3049
3050 #ifndef _WSPIAPI_H_
3051 #define _WSPIAPI_H_
3052 +#if __GNUC__ >=3
3053 +#pragma GCC system_header
3054 +#endif
3055
3056 #pragma once
3057
3058 @@ -85,6 +88,11 @@
3059
3060 #ifdef __cplusplus
3061 extern "C" {
3062 +#define _inline inline
3063 +#define __inline inline
3064 +#else
3065 +#define _inline static __inline__
3066 +#define __inline static __inline__
3067 #endif
3068
3069 ////////////////////////////////////////////////////////////
3070 @@ -1052,6 +1060,8 @@
3071 (*pfFreeAddrInfo)(ai);
3072 }
3073
3074 +#undef _inline
3075 +#undef __inline
3076 #ifdef __cplusplus
3077 }
3078 #endif
3079 --- include/d3dtypes.h.orig 2004-09-27 12:34:16.000000000 +0900
3080 +++ include/d3dtypes.h 2007-11-30 21:42:09.558750000 +0900
3081 @@ -1,3 +1,6 @@
3082 +#if __GNUC__ >=3
3083 +#pragma GCC system_header
3084 +#endif
3085 /*==========================================================================;
3086 *
3087 * Copyright (C) Microsoft Corporation. All Rights Reserved.
3088 --- include/d3dx9math.h.orig 2005-07-22 17:00:18.000000000 +0900
3089 +++ include/d3dx9math.h 2007-11-30 21:41:52.230625000 +0900
3090 @@ -1,3 +1,6 @@
3091 +#if __GNUC__ >=3
3092 +#pragma GCC system_header
3093 +#endif
3094 //////////////////////////////////////////////////////////////////////////////
3095 //
3096 // Copyright (C) Microsoft Corporation. All Rights Reserved.
3097 --- include/d3dx9math.inl.orig 2005-03-18 17:26:56.000000000 +0900
3098 +++ include/d3dx9math.inl 2007-11-30 21:41:38.496250000 +0900
3099 @@ -1,3 +1,6 @@
3100 +#if __GNUC__ >=3
3101 +#pragma GCC system_header
3102 +#endif
3103 //////////////////////////////////////////////////////////////////////////////
3104 //
3105 // Copyright (C) Microsoft Corporation. All Rights Reserved.
3106 --- include/d3dx9core.h.orig 2006-03-31 12:16:02.000000000 +0900
3107 +++ include/d3dx9core.h 2007-11-30 21:41:13.199375000 +0900
3108 @@ -1,3 +1,6 @@
3109 +#if __GNUC__ >=3
3110 +#pragma GCC system_header
3111 +#endif
3112 ///////////////////////////////////////////////////////////////////////////
3113 //
3114 // Copyright (C) Microsoft Corporation. All Rights Reserved.
3115 --- include/msi.h.orig 2008-01-18 22:17:28.000000000 +0900
3116 +++ include/msi.h 2009-02-16 21:34:39.065125000 +0900
3117 @@ -59,6 +59,14 @@
3118 #endif // _MSI_NO_CRYPTO
3119 #endif //(_WIN32_MSI >= 150)
3120
3121 +#define __in
3122 +#define __out
3123 +#ifdef __cplusplus
3124 +#define __inline inline
3125 +#else
3126 +#define __inline static __inline__
3127 +#endif
3128 +
3129 // --------------------------------------------------------------------------
3130 // Installer generic handle definitions
3131 // --------------------------------------------------------------------------
3132 @@ -2248,5 +2256,9 @@
3133 // LOCALIZE END
3134
3135
3136 +#undef __in
3137 +#undef __out
3138 +#undef __inline
3139 +
3140 #endif // _MSI_H_
3141
3142 --- include/msiquery.h.orig 2008-01-18 22:17:28.000000000 +0900
3143 +++ include/msiquery.h 2009-02-16 21:34:39.065125000 +0900
3144 @@ -21,6 +21,14 @@
3145 #define _MSIQUERY_H_
3146 #include "msi.h" // INSTALLSTATE
3147
3148 +#define __in
3149 +#define __out
3150 +#ifdef __cplusplus
3151 +#define __inline inline
3152 +#else
3153 +#define __inline static __inline__
3154 +#endif
3155 +
3156 #define MSI_NULL_INTEGER 0x80000000 // integer value reserved for null
3157
3158 // MsiOpenDatabase persist predefine values, otherwise output database path is used
3159 @@ -1026,5 +1034,9 @@
3160 }
3161 #endif
3162
3163 +#undef __in
3164 +#undef __out
3165 +#undef __inline
3166 +
3167 #endif // _MSIQUERY_H_
3168
3169 --- include/olectl.h.orig 2008-03-22 06:10:42.000000000 +1000
3170 +++ include/olectl.h 2009-02-16 21:34:39.065125000 +0900
3171 @@ -28,6 +28,14 @@
3172 #include <ocidl.h>
3173 #endif // _MAC
3174
3175 +#define __in
3176 +#define __out
3177 +#ifdef __cplusplus
3178 +#define __inline inline
3179 +#else
3180 +#define __inline static __inline__
3181 +#endif
3182 +
3183 #ifdef _OLEAUT32_
3184 #define WINOLECTLAPI STDAPI
3185 #define WINOLECTLAPI_(type) STDAPI_(type)
3186 @@ -616,5 +624,9 @@
3187
3188 #endif // defined(__MKTYPLIB__) || defined(__midl)
3189
3190 +#undef __in
3191 +#undef __out
3192 +#undef __inline
3193 +
3194 #endif // _OLECTL_H_
3195
3196 --- include/propkeydef.h.orig 2008-01-18 22:17:32.000000000 +0900
3197 +++ include/propkeydef.h 2008-03-22 21:56:32.734375000 +1000
3198 @@ -2,6 +2,10 @@
3199 #define PID_FIRST_USABLE 2
3200 #endif
3201
3202 +#ifndef __MIDL_CONST
3203 +#define __MIDL_CONST const
3204 +#endif
3205 +
3206 #ifndef REFPROPERTYKEY
3207 #ifdef __cplusplus
3208 #define REFPROPERTYKEY const PROPERTYKEY &
3209 --- icnlude/dxtrans.h.orig 2004-09-28 00:18:32.000000000 +0900
3210 +++ include/dxtrans.h 2007-01-02 22:08:41.640625000 +0900
3211 @@ -1,3 +1,6 @@
3212 +#if __GNUC__ >=3
3213 +#pragma GCC system_header
3214 +#endif
3215
3216 #pragma warning( disable: 4049 ) /* more than 64k source lines */
3217
FREE OFFICE SUITE