Avoid multiple symbol definitions when linking several .o together
---
mingw-w64-headers/include/combaseapi.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mingw-w64-headers/include/combaseapi.h
b/mingw-w64-headers/include/combaseapi.h
index b79c4db..3536e25 100644
--- a/mingw-w64-headers/include/combaseapi.h
+++ b/mingw-w64-headers/include/combaseapi.h
@@ -258,7 +258,7 @@ WINOLEAPI CoCreateInstanceEx (REFCLSID Clsid, IUnknown
*punkOuter, DWORD dwClsCt
#endif
#if WINAPI_FAMILY == WINAPI_FAMILY_APP
- __inline HRESULT CoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter,
DWORD dwClsContext, REFIID riid, LPVOID *ppv) {
+ __forceinline HRESULT CoCreateInstance (REFCLSID rclsid, LPUNKNOWN
pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID *ppv) {
MULTI_QI OneQI;
HRESULT hr;
@@ -273,7 +273,7 @@ WINOLEAPI CoCreateInstanceEx (REFCLSID Clsid, IUnknown
*punkOuter, DWORD dwClsCt
return FAILED (hr) ? hr : OneQI.hr;
}
- __inline HRESULT CoCreateInstanceEx (REFCLSID Clsid, IUnknown *punkOuter,
DWORD dwClsCtx, COSERVERINFO *pServerInfo, DWORD dwCount, MULTI_QI *pResults) {
+ __forceinline HRESULT CoCreateInstanceEx (REFCLSID Clsid, IUnknown
*punkOuter, DWORD dwClsCtx, COSERVERINFO *pServerInfo, DWORD dwCount, MULTI_QI
*pResults) {
return CoCreateInstanceFromApp (Clsid, punkOuter, dwClsCtx, pServerInfo,
dwCount, pResults);
}
#endif
--
1.8.3.2
------------------------------------------------------------------------------
DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
