odk/Library_unowinreg.mk | 1 -
odk/source/unowinreg/win/unowinreg.def | 11 -----------
2 files changed, 12 deletions(-)
New commits:
commit 433221d66bd178a41e2b665be5909bc8048593bf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Sep 20 15:49:01 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Sep 21 09:42:06 2018 +0200
Get rid of redundant odk/source/unowinreg/win/unowinreg.def
...similar to 28b4f4aeaf160c7721dfecf5bd2445d7dbc6f01c "Get rid of Windows
.def
files in setup_native, use __declspec(dllexport)". And JNIEXPORT (with
which
the listed functions are decorated in
odk/source/unowinreg/win/unowinreg.cxx)
already implies __declspec(dllexport).
Change-Id: I45fd1d50cd3b072d124002e469c70eb1d6ed7610
Reviewed-on: https://gerrit.libreoffice.org/60819
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/odk/Library_unowinreg.mk b/odk/Library_unowinreg.mk
index d2a20f88a64f..a514168cdca0 100644
--- a/odk/Library_unowinreg.mk
+++ b/odk/Library_unowinreg.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_add_libs,unowinreg,\
))
else
$(eval $(call gb_Library_add_ldflags,unowinreg,\
- /DEF:$(SRCDIR)/odk/source/unowinreg/win/unowinreg.def \
/MANIFEST:NO \
))
endif
diff --git a/odk/source/unowinreg/win/unowinreg.def
b/odk/source/unowinreg/win/unowinreg.def
deleted file mode 100644
index 232261b99fb7..000000000000
--- a/odk/source/unowinreg/win/unowinreg.def
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBRARY "unowinreg.dll"
-EXPORTS
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenClassesRoot
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentConfig
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentUser
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenLocalMachine
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenUsers
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenKeyEx
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegCloseKey
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegQueryValueEx
-
Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegQueryInfoKey
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
