diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-13 11:44:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-18 17:19:15 +0100 |
commit | 94f790a4e6158cf4d6cf74fe75601a7eac0579a1 (patch) | |
tree | c954b6a654c25a147e2828cb62d768cfbdf5170c /embedserv/source | |
parent | 000af551ed917f6c3cd7fde525050693ac2ad413 (diff) |
-Werror,-Wduplicate-decl-specifier (extern "C" already in STDAPI)
Change-Id: I634debc05a24e0d519200fc91a77d50f36b9af38
Diffstat (limited to 'embedserv/source')
-rw-r--r-- | embedserv/source/inprocserv/dllentry.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index ea5fb5329aba..5f70df9138d1 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -179,7 +179,7 @@ extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwRe } -extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) +STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { for( int nInd = 0; nInd < SUPPORTED_FACTORIES_NUM; nInd++ ) if ( *guidList[nInd] == rclsid ) @@ -196,7 +196,7 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID ri } -extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() +STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() { if ( !g_nObj && !g_nLock ) return S_OK; |