summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-27 09:33:41 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-28 08:44:51 +0100
commitb98febded45cea4d20cae284be84ac4b65e27775 (patch)
tree6a7156f4bf5bd973daf4277aae1dcf0fb002bd74
parent-Werror,-Wunused-function (diff)
downloadcore-b98febded45cea4d20cae284be84ac4b65e27775.tar.gz
core-b98febded45cea4d20cae284be84ac4b65e27775.zip
-Werror,-Wduplicate-decl-specifier (extern "C" already in STDAPI)
Change-Id: I2f170c8ad2ef30f49062fdeee4bcdcf5baf552db
-rw-r--r--shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index f38070621406..b9c586442097 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -406,7 +406,7 @@ bool CClassFactory::IsLocked()
}
-extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
{
OutputDebugStringFormat( "DllGetClassObject.\n" );
*ppv = 0;
@@ -423,7 +423,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
}
-extern "C" STDAPI DllCanUnloadNow()
+STDAPI DllCanUnloadNow()
{
OutputDebugStringFormat( "DllCanUnloadNow.\n" );
if (CClassFactory::IsLocked() || g_DllRefCnt > 0)