diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-15 13:04:07 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-18 17:19:17 +0100 |
| commit | 3b45c0ca62ffe16e6472ab2acf4b6e0816728ac7 (patch) | |
| tree | bee36fffcca28e2d38445c947fd366d42fdc0158 /shell | |
| parent | cc6241ff8c4a72ddeb203ae7fda7539f6f120689 (diff) | |
-Werror,-Wduplicate-decl-specifier (extern "C" already in STDAPI)
Change-Id: Ibd633b37e134483b778dcf7bdee1a1a3f377b699
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/shlxthdl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index fb6c1f44af42..e9ca1b8d7e2d 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -302,7 +302,7 @@ namespace /* private */ // COM exports -extern "C" STDAPI DllRegisterServer() +STDAPI DllRegisterServer() { TCHAR ModuleFileName[MAX_PATH]; @@ -340,7 +340,7 @@ extern "C" STDAPI DllRegisterServer() return hr; } -extern "C" STDAPI DllUnregisterServer() +STDAPI DllUnregisterServer() { HRESULT hr = S_OK; @@ -370,7 +370,7 @@ extern "C" STDAPI DllUnregisterServer() return hr; } -extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) { *ppv = 0; @@ -397,7 +397,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) return S_OK; } -extern "C" STDAPI DllCanUnloadNow() +STDAPI DllCanUnloadNow() { if (CClassFactory::IsLocked() || g_DllRefCnt > 0) return S_FALSE; |