Module: wine Branch: master Commit: 7afdf5d9204fdccb74f547ca8588b76100e1738a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afdf5d9204fdccb74f547ca85...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Oct 1 13:42:22 2010 +0200
Make some variable declarations extern.
---
dlls/msxml3/msxml_private.h | 2 +- dlls/rpcrt4/cpsf.h | 4 ++-- dlls/wined3d/wined3d_private.h | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index a1b3b9d..6d97e96 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -223,7 +223,7 @@ static inline HRESULT return_null_ptr(void **p)
#endif
-void* libxslt_handle; +extern void* libxslt_handle; #ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H # include <libxslt/pattern.h> diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 9cc046f..e8f1a2d 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -35,8 +35,8 @@ HRESULT CStdStubBuffer_Delegating_Construct(REFIID riid, LPUNKNOWN pUnkServer, P
const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface);
-const IRpcStubBufferVtbl CStdStubBuffer_Vtbl; -const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl; +extern const IRpcStubBufferVtbl CStdStubBuffer_Vtbl; +extern const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl;
BOOL fill_delegated_proxy_table(IUnknownVtbl *vtbl, DWORD num); HRESULT create_proxy(REFIID iid, IUnknown *pUnkOuter, IRpcProxyBuffer **pproxy, void **ppv); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ab89c5..33bb437 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -157,11 +157,11 @@ struct min_lookup GLenum mip[WINED3DTEXF_LINEAR + 1]; };
-const struct min_lookup minMipLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const struct min_lookup minMipLookup_noMip[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const GLenum magLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const GLenum magLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const struct min_lookup minMipLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const struct min_lookup minMipLookup_noMip[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const GLenum magLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const GLenum magLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN;
static inline GLenum wined3d_gl_mag_filter(const GLenum mag_lookup[], WINED3DTEXTUREFILTERTYPE mag_filter) { @@ -2576,7 +2576,7 @@ struct IWineD3DSwapChainImpl HWND device_window; };
-const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl DECLSPEC_HIDDEN; +extern const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl DECLSPEC_HIDDEN; void x11_copy_to_screen(IWineD3DSwapChainImpl *This, const RECT *rc) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface,