[Libreoffice-commits] core.git: extensions/source

Mike Kaganski mike.kaganski at collabora.com
Tue Oct 18 13:30:34 UTC 2016


 extensions/source/activex/so_activex.def |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9939d2053d5eb45268d3bd356a270ff5ab90905e
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Oct 18 22:16:50 2016 +1000

    so_activex_x64: Avoid warning LNK4070
    
    Don't specify optional library name in DEF file that is used both
    for 32-bit and 64-bit library: it's explicitly specified in command
    line.
    
    Change-Id: I20e732f2095367ec3648741dde26cf7ec101f28f
    Reviewed-on: https://gerrit.libreoffice.org/30008
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/extensions/source/activex/so_activex.def b/extensions/source/activex/so_activex.def
index d3f7d9e..9f81e79 100644
--- a/extensions/source/activex/so_activex.def
+++ b/extensions/source/activex/so_activex.def
@@ -1,6 +1,6 @@
 ; iervp.def : Declares the module parameters.
 
-LIBRARY      "so_activex.dll"
+LIBRARY
 
 EXPORTS
 	DllCanUnloadNow     PRIVATE


More information about the Libreoffice-commits mailing list