From 3149c04bb7fd79ae1b206a257b8195a209fa34c7 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sat, 5 Dec 2015 20:37:41 +1000 Subject: Resolve Linker Warning LNK4104 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://msdn.microsoft.com/en-us/library/e821azx1.aspx Some export symbols should be PRIVATE Also, don't export DLLMain. It is internal function used by CRT, and not intended to be exported. Change-Id: I48139b985aa2ee499c2005d8b0d966a2cc6dcd0c Reviewed-on: https://gerrit.libreoffice.org/20419 Tested-by: Jenkins Reviewed-by: Matúš Kukan --- embedserv/Library_inprocserv.mk | 6 +----- embedserv/source/inprocserv/inprocserv.def | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 embedserv/source/inprocserv/inprocserv.def (limited to 'embedserv') diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 8a153f849d98..a000c9cf4786 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -27,11 +27,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ - /EXPORT:DllCanUnloadNow \ - /EXPORT:DllGetClassObject \ - /EXPORT:DllMain \ - /EXPORT:DllRegisterServer \ - /EXPORT:DllUnregisterServer \ + /DEF:$(SRCDIR)/embedserv/source/inprocserv/inprocserv.def \ )) endif diff --git a/embedserv/source/inprocserv/inprocserv.def b/embedserv/source/inprocserv/inprocserv.def new file mode 100644 index 000000000000..d731a151f0db --- /dev/null +++ b/embedserv/source/inprocserv/inprocserv.def @@ -0,0 +1,5 @@ +EXPORTS + DllCanUnloadNow PRIVATE + DllGetClassObject PRIVATE + DllRegisterServer PRIVATE + DllUnregisterServer PRIVATE -- cgit