summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-04-10 09:52:21 +0000
committerRelease Engineers <releng@openoffice.org>2009-04-10 09:52:21 +0000
commit303ca12cfa1ae5c92f89a31d039a484d71ae1147 (patch)
treed8383599a79f29f2609b82ffbe746b78055193b9 /external
parent4039bec2f465b8d66f79c6d69de64b43147cda9a (diff)
CWS-TOOLING: integrate CWS mingwport18
2009-03-27 12:51:41 +0100 tono r270150 : CWS-TOOLING: rebase CWS mingwport18 to trunk@270033 (milestone: DEV300:m45) 2009-03-26 22:41:14 +0100 tono r270120 : files with invalid names removed 2009-03-26 22:40:11 +0100 tono r270119 : files with invalid names removed 2009-03-26 22:39:04 +0100 tono r270118 : files with invalid names removed 2009-03-26 22:36:00 +0100 tono r270117 : files with invalid names removed 2009-03-26 22:33:42 +0100 tono r270116 : files with invalid names removed 2009-03-26 22:32:14 +0100 tono r270115 : files with invalid names removed 2009-03-26 22:24:41 +0100 tono r270114 : files with invalid names removed 2009-03-26 22:16:41 +0100 tono r270113 : files with invalid names removed 2009-03-26 22:15:52 +0100 tono r270112 : files with invalid names removed 2009-03-26 22:14:44 +0100 tono r270111 : files with invalid names removed 2009-03-26 22:12:28 +0100 tono r270110 : files with invalid names removed 2009-03-26 21:46:31 +0100 tono r270109 : files with invalid names removed 2009-03-22 12:41:21 +0100 tono r269847 : i#100463: MinGW port header patch enhancement 2009-03-22 12:39:39 +0100 tono r269846 : i#100462: MinGW port update for python 2009-03-22 12:37:52 +0100 tono r269845 : i#100461: MinGW port fix for store/workben 2009-03-22 12:36:10 +0100 tono r269844 : i#100460: MinGW port fix for sal when debug=true 2009-03-21 01:06:50 +0100 tono r269833 : i#100210: MinGW port fix for hunspell-1.2.8 2009-03-21 01:04:08 +0100 tono r269832 : i#100209: MinGW port fix for sspi
Diffstat (limited to 'external')
-rw-r--r--external/mingwheaders/mingw_headers.patch148
1 files changed, 76 insertions, 72 deletions
diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch
index b6561ff497d1..fdb17a750c33 100644
--- a/external/mingwheaders/mingw_headers.patch
+++ b/external/mingwheaders/mingw_headers.patch
@@ -840,7 +840,7 @@
{
ULONG cbOID;
--- include/commctrl.h.orig 2008-01-18 22:17:14.000000000 +0900
-+++ include/commctrl.h 2008-03-27 00:30:22.281000000 +0900
++++ include/commctrl.h 2009-02-16 21:34:39.065125000 +0900
@@ -14,6 +14,14 @@
#ifndef _INC_COMMCTRL
#define _INC_COMMCTRL
@@ -850,7 +850,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -1081,7 +1081,7 @@
StringTrimming trimming;
SetStatus(DllExports::GdipGetStringFormatTrimming(
--- include/imagehlp.h.orig 2008-03-22 06:10:42.084500000 +1000
-+++ include/imagehlp.h 2008-03-24 02:29:51.398250000 +1000
++++ include/imagehlp.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -1098,7 +1098,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
#ifdef __cplusplus
@@ -1414,7 +1414,7 @@
GetVersionExA((OSVERSIONINFOA*)&osvi);
return (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId);
--- include/ntquery.h.orig 2008-01-18 22:17:30.000000000 +0900
-+++ include/ntquery.h 2008-03-27 00:04:44.749750000 +0900
++++ include/ntquery.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -1431,7 +1431,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#if defined(__cplusplus)
@@ -1449,7 +1449,7 @@
--- include/ocidl.h.orig 2008-03-22 06:10:42.272000000 +1000
-+++ include/ocidl.h 2008-03-24 02:27:18.132625000 +1000
++++ include/ocidl.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -1466,7 +1466,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef __cplusplus
@@ -1498,7 +1498,7 @@
--- include/oleauto.h.orig 2008-03-22 06:10:43.225125000 +1000
-+++ include/oleauto.h 2008-03-24 02:27:37.304500000 +1000
++++ include/oleauto.h 2009-02-16 21:34:39.065125000 +0900
@@ -56,6 +56,14 @@
/* pull in the MIDL generated header */
#include <oaidl.h>
@@ -1508,7 +1508,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
@@ -1562,7 +1562,7 @@
typedef struct _FILETIME {
DWORD dwLowDateTime;
--- include/oleidl.h.orig 2008-03-22 06:10:42.350125000 +1000
-+++ include/oleidl.h 2008-03-24 02:27:27.195125000 +1000
++++ include/oleidl.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -1579,7 +1579,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef __cplusplus
@@ -1597,7 +1597,7 @@
--- include/propidl.h.orig 2008-01-18 22:17:32.000000000 +0900
-+++ include/propidl.h 2008-03-27 20:26:16.221125000 +0900
++++ include/propidl.h 2009-02-16 21:34:39.065125000 +0900
@@ -76,6 +76,14 @@
#include "objidl.h"
#include "oaidl.h"
@@ -1607,7 +1607,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef __cplusplus
@@ -1655,7 +1655,7 @@
--- include/propsys.h.orig 2008-03-22 06:10:42.412625000 +1000
-+++ include/propsys.h 2008-03-24 02:29:37.085750000 +1000
++++ include/propsys.h 2009-02-16 21:34:39.065125000 +0900
@@ -228,6 +228,14 @@
#endif // 0
#include <propkeydef.h>
@@ -1665,7 +1665,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
@@ -1707,7 +1707,7 @@
extern RPC_IF_HANDLE __MIDL_itf_qedit_0001_0097_v0_0_c_ifspec;
--- include/shlobj.h.orig 2008-01-18 22:17:36.000000000 +0900
-+++ include/shlobj.h 2008-03-26 23:51:11.765375000 +0900
++++ include/shlobj.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -1724,7 +1724,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -2272,7 +2272,7 @@
#endif /* _SHLOBJ_H_ */
--- include/shobjidl.h.orig 2008-01-18 22:17:36.000000000 +0900
-+++ include/shobjidl.h 2008-03-26 23:40:50.202875000 +0900
++++ include/shobjidl.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -2289,7 +2289,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef __cplusplus
@@ -2328,7 +2328,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_c_ifspec;
@@ -2363,7 +2363,7 @@
typedef /* [wire_marshal] */ ITEMIDLIST __unaligned *LPITEMIDLIST;
--- include/specstrings.h.orig 2008-01-18 22:17:38.000000000 +0900
-+++ include/specstrings.h 2008-03-26 22:08:28.484125000 +0900
++++ include/specstrings.h 2009-02-16 21:34:39.065125000 +0900
@@ -6,7 +6,106 @@
#if _MSC_VER
#pragma once
@@ -2466,14 +2466,14 @@
+#define __forceinline inline
+#define __inline inline
+#else
-+#define __forceinline static
-+#define __inline static
++#define __forceinline static __inline__
++#define __inline static __inline__
+#endif
#ifndef __SAL_H_FULL_VER
#define __SAL_H_FULL_VER 140050727
--- include/sspi.h.orig 2008-03-22 06:10:42.631375000 +1000
-+++ include/sspi.h 2008-03-24 23:27:32.546000000 +1000
++++ include/sspi.h 2009-02-16 21:34:39.065125000 +0900
@@ -20,6 +20,14 @@
#define __SSPI_H__
// end_ntifs
@@ -2483,29 +2483,23 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#if _MSC_VER > 1000
#pragma once
#endif
-@@ -2154,6 +2162,7 @@
+@@ -2154,8 +2162,7 @@
// begin_ntifs
-+#if 0
- #ifndef _AUTH_IDENTITY_DEFINED
- #define _AUTH_IDENTITY_DEFINED
-
-@@ -2204,6 +2213,7 @@
- // begin_ntifs
-
- #endif //_AUTH_IDENTITY_DEFINED // ntifs
-+#endif
+-#ifndef _AUTH_IDENTITY_DEFINED
+-#define _AUTH_IDENTITY_DEFINED
++#ifndef SEC_WINNT_AUTH_IDENTITY_ANSI
//
- // This is the combined authentication identity structure that may be
-@@ -2326,6 +2336,10 @@
+ // This was not defined in NTIFS.h for windows 2000 however
+@@ -2326,6 +2333,10 @@
} // extern "C"
#endif
@@ -2517,7 +2511,7 @@
#endif // __SSPI_H__
// end_ntifs
--- include/strmif.h.orig 2008-01-18 22:17:38.000000000 +0900
-+++ include/strmif.h 2008-03-26 22:01:05.171625000 +0900
++++ include/strmif.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -2534,7 +2528,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef __cplusplus
@@ -2570,7 +2564,7 @@
--- include/strsafe.h.orig 2008-01-18 22:17:38.000000000 +0900
-+++ include/strsafe.h 2008-03-25 23:53:50.406125000 +0900
++++ include/strsafe.h 2009-02-16 21:34:39.065125000 +0900
@@ -13,12 +13,23 @@
#if (_MSC_VER > 1000)
#pragma once
@@ -2589,7 +2583,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#if !defined(_W64)
@@ -2615,7 +2609,7 @@
#endif // _STRSAFE_H_INCLUDED_
--- include/structuredquery.h.orig 2008-03-22 06:10:42.756375000 +1000
-+++ include/structuredquery.h 2008-03-24 02:28:22.507625000 +1000
++++ include/structuredquery.h 2009-02-16 21:34:39.065125000 +0900
@@ -233,6 +233,14 @@
#include "ocidl.h"
#include "propidl.h"
@@ -2625,7 +2619,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef __cplusplus
@@ -2643,7 +2637,7 @@
--- include/urlmon.h.orig 2008-03-22 06:10:42.818875000 +1000
-+++ include/urlmon.h 2008-03-24 02:28:32.507625000 +1000
++++ include/urlmon.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -2660,7 +2654,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef __cplusplus
@@ -2678,7 +2672,7 @@
--- include/wincrypt.h.orig 2008-01-18 22:17:42.000000000 +0900
-+++ include/wincrypt.h 2008-03-26 21:55:55.765375000 +0900
++++ include/wincrypt.h 2009-02-16 21:34:39.065125000 +0900
@@ -14,6 +14,14 @@
#include <specstrings.h> /* for SAL annotations */
@@ -2688,7 +2682,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#if defined (_MSC_VER)
@@ -2703,7 +2697,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
// This type is used when the API can take either the CAPI1 HCRYPTPROV or
@@ -2743,7 +2737,7 @@
#ifndef __midl
--- include/wingdi.h.orig 2008-03-22 06:10:42.897000000 +1000
-+++ include/wingdi.h 2008-03-24 02:29:11.523250000 +1000
++++ include/wingdi.h 2009-02-16 21:34:39.065125000 +0900
@@ -9,6 +9,13 @@
#ifndef _WINGDI_
#define _WINGDI_
@@ -2753,7 +2747,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
#pragma once
@@ -2818,7 +2812,7 @@
--- include/winsock2.h.orig 2008-03-22 06:10:42.912625000 +1000
-+++ include/winsock2.h 2008-03-24 02:29:01.882625000 +1000
++++ include/winsock2.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -2848,7 +2842,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
/*
@@ -2880,7 +2874,7 @@
--- include/winuser.h.orig 2008-07-19 14:56:51.278750000 +0900
-+++ include/winuser.h 2008-07-20 08:20:08.111750000 +0900
++++ include/winuser.h 2009-02-16 21:34:39.065125000 +0900
@@ -11,6 +11,15 @@
#ifndef _WINUSER_
#define _WINUSER_
@@ -2890,7 +2884,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+DECLARE_HANDLE(HHOOK);
+typedef CONST GUID *LPCGUID;
@@ -2951,7 +2945,7 @@
--- include/ws2ipdef.h.orig 2008-01-18 22:17:44.000000000 +0900
-+++ include/ws2ipdef.h 2008-03-27 20:23:19.096125000 +0900
++++ include/ws2ipdef.h 2009-02-16 21:34:39.065125000 +0900
@@ -1,3 +1,6 @@
+#if __GNUC__ >=3
+#pragma GCC system_header
@@ -2969,7 +2963,7 @@
+#define WS2TCPIP_INLINE inline
#else
-#define WS2TCPIP_INLINE extern inline /* GNU style */
-+#define WS2TCPIP_INLINE static
++#define WS2TCPIP_INLINE static __inline__
#endif
#include <in6addr.h>
@@ -2992,8 +2986,18 @@
//
--- include/ws2tcpip.h.orig 2008-01-18 22:17:44.000000000 +0900
-+++ include/ws2tcpip.h 2008-03-27 01:28:41.937250000 +0900
-@@ -27,15 +27,23 @@
++++ include/ws2tcpip.h 2009-02-16 21:34:39.065125000 +0900
+@@ -18,6 +18,9 @@
+
+ #ifndef _WS2TCPIP_H_
+ #define _WS2TCPIP_H_
++#if __GNUC__ >=3
++#pragma GCC system_header
++#endif
+
+ #if _MSC_VER > 1000
+ #pragma once
+@@ -27,15 +30,23 @@
#include <ws2ipdef.h>
#include <limits.h>
@@ -3002,7 +3006,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
/* Option to use with [gs]etsockopt at the IPPROTO_UDP level */
@@ -3016,11 +3020,11 @@
+#define WS2TCPIP_INLINE inline
#else
-#define WS2TCPIP_INLINE extern inline /* GNU style */
-+#define WS2TCPIP_INLINE static
++#define WS2TCPIP_INLINE static __inline__
#endif
/* Error codes from getaddrinfo() */
-@@ -835,7 +843,7 @@
+@@ -835,7 +846,7 @@
return Error;
}
@@ -3029,7 +3033,7 @@
WS2TCPIP_INLINE
int
setsourcefilter(
-@@ -1056,5 +1064,9 @@
+@@ -1056,5 +1067,9 @@
#include <wspiapi.h>
#endif
@@ -3040,7 +3044,7 @@
#endif /* _WS2TCPIP_H_ */
--- include/wspiapi.h.orig 2005-04-14 17:55:04.000000000 +0900
-+++ include/wspiapi.h 2006-12-30 18:25:01.375000000 +0900
++++ include/wspiapi.h 2009-02-16 21:34:39.065125000 +0900
@@ -15,6 +15,9 @@
#ifndef _WSPIAPI_H_
@@ -3058,8 +3062,8 @@
+#define _inline inline
+#define __inline inline
+#else
-+#define _inline static
-+#define __inline static
++#define _inline static __inline__
++#define __inline static __inline__
#endif
////////////////////////////////////////////////////////////
@@ -3109,7 +3113,7 @@
//
// Copyright (C) Microsoft Corporation. All Rights Reserved.
--- include/msi.h.orig 2008-01-18 22:17:28.000000000 +0900
-+++ include/msi.h 2008-03-24 23:41:17.249125000 +1000
++++ include/msi.h 2009-02-16 21:34:39.065125000 +0900
@@ -59,6 +59,14 @@
#endif // _MSI_NO_CRYPTO
#endif //(_WIN32_MSI >= 150)
@@ -3119,7 +3123,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
// --------------------------------------------------------------------------
@@ -3136,7 +3140,7 @@
#endif // _MSI_H_
--- include/msiquery.h.orig 2008-01-18 22:17:28.000000000 +0900
-+++ include/msiquery.h 2008-03-24 23:42:24.983500000 +1000
++++ include/msiquery.h 2009-02-16 21:34:39.065125000 +0900
@@ -21,6 +21,14 @@
#define _MSIQUERY_H_
#include "msi.h" // INSTALLSTATE
@@ -3146,7 +3150,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#define MSI_NULL_INTEGER 0x80000000 // integer value reserved for null
@@ -3163,7 +3167,7 @@
#endif // _MSIQUERY_H_
--- include/olectl.h.orig 2008-03-22 06:10:42.000000000 +1000
-+++ include/olectl.h 2008-03-24 23:32:05.264750000 +1000
++++ include/olectl.h 2009-02-16 21:34:39.065125000 +0900
@@ -28,6 +28,14 @@
#include <ocidl.h>
#endif // _MAC
@@ -3173,7 +3177,7 @@
+#ifdef __cplusplus
+#define __inline inline
+#else
-+#define __inline static
++#define __inline static __inline__
+#endif
+
#ifdef _OLEAUT32_
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 00:32:44 +0000