fdo#63154: Remove all usages of the macro EXTERN_C

Change-Id: I25b7f509ba5d1007a16c84ad05870a8174c094ec
Reviewed-on: https://gerrit.libreoffice.org/3621Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

embedserv/source/inc/embservconst.h

@@ -31,35 +31,35 @@
 #define SUPPORTED_FACTORIES_NUM 10
 
 #if defined(__MINGW32__) && !defined(INITGUID)
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterTextServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_WriterTextServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer;
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcOASISServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_CalcServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_CalcOASISServer;
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer;
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer;
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathOASISServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_MathServer;
+extern "C" const GUID DECLSPEC_SELECTANY OID_MathOASISServer;
 #else
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterTextServer = { SO3_SW_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer = { SO3_SW_OLE_EMBED_CLASSID_8 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_WriterTextServer = { SO3_SW_OLE_EMBED_CLASSID_60 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer = { SO3_SW_OLE_EMBED_CLASSID_8 };
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcServer = { SO3_SC_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcOASISServer = { SO3_SC_OLE_EMBED_CLASSID_8 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_CalcServer = { SO3_SC_OLE_EMBED_CLASSID_60 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_CalcOASISServer = { SO3_SC_OLE_EMBED_CLASSID_8 };
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingServer = { SO3_SDRAW_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer = { SO3_SDRAW_OLE_EMBED_CLASSID_8 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingServer = { SO3_SDRAW_OLE_EMBED_CLASSID_60 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer = { SO3_SDRAW_OLE_EMBED_CLASSID_8 };
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_8 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_60 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_8 };
 
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathServer = { SO3_SM_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathOASISServer = { SO3_SM_OLE_EMBED_CLASSID_8 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_MathServer = { SO3_SM_OLE_EMBED_CLASSID_60 };
+extern "C" const GUID DECLSPEC_SELECTANY OID_MathOASISServer = { SO3_SM_OLE_EMBED_CLASSID_8 };
 #endif
 
 #endif

include/tools/solar.h

@@ -107,12 +107,6 @@ inline void     DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((sal_uInt8*)&n)[7
 #endif
 #endif
 
-#ifdef __cplusplus
-#define EXTERN_C    extern "C"
-#else
-#define EXTERN_C
-#endif
-
 #define _LF     ((char)0x0A)
 #define _CR     ((char)0x0D)
 

lotuswordpro/source/filter/lwpfilter.hxx

@@ -86,8 +86,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star;
 
-#define EXTERN_C extern "C"
-
 /**
  * @brief
  * Implements the XFilter interface.

sal/systools/win32/uwinapi/legacy.c

@@ -14,7 +14,7 @@
 #pragma warning(disable:4273)       // inconsistent dll linkage
 #endif
 
-EXTERN_C DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR lpszShortPath,DWORD cchBuffer)
+extern "C" DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR lpszShortPath,DWORD cchBuffer)
 {
     typedef DWORD (WINAPI * GetShortPathNameW_t) (LPCWSTR,LPWSTR,DWORD);
 

sfx2/source/control/dispatch.cxx

@@ -1734,7 +1734,7 @@ void SfxDispatcher::SetSlotFilter
 }
 
 //--------------------------------------------------------------------
-EXTERN_C
+extern "C"
 #ifdef WNT
 int _cdecl
 #else

sfx2/source/control/objface.cxx

@@ -35,7 +35,7 @@ DBG_NAME(SfxInterface)
 
 //====================================================================
 
-EXTERN_C
+extern "C"
 #ifdef WNT
 int _cdecl
 #else