shell/Library_ooofilt.mk | 8 ++++----
shell/Library_ooofilt_x64.mk | 8 ++++----
shell/Library_propertyhdl.mk | 4 ++--
shell/Library_propertyhdl_x64.mk | 4 ++--
shell/Library_shlxthdl.mk | 8 ++++----
shell/Library_shlxthdl_x64.mk | 8 ++++----
6 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 7dce4fb5e4e6e56cb6c4dc6b7b1bc127b70a07f4
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon May 28 15:23:46 2012 +0200
partially revert 3ca7b8c296bcda699bcf642db3932b3fdbe7ad06
It is not possible to use PRIVATE this way.
So, there are still warnings as:
LINK : warning LNK4104: export of symbol 'DllCanUnloadNow' should be PRIVATE
Change-Id: I9f14dd95b611475ef89914270c931a7115f1f5c8
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 35e3662..af30efb 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -76,10 +76,10 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt,\
))
$(eval $(call gb_Library_add_ldflags,ooofilt,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_exception_objects,ooofilt,\
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index ca779ff..7620d52 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -78,10 +78,10 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
))
$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 8b7d7ff..4d701cd 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -74,8 +74,8 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl,\
))
$(eval $(call gb_Library_add_ldflags,propertyhdl,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
))
$(eval $(call gb_Library_add_exception_objects,propertyhdl,\
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index c84738b..f613bd3 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -79,8 +79,8 @@ $(eval $(call
gb_Library_use_static_libraries,propertyhdl_x64,\
))
$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
))
$(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index c546db6..b8df8a9 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -74,10 +74,10 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\
$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
$(eval $(call gb_Library_add_ldflags,shlxthdl,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_exception_objects,shlxthdl,\
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index d1e2d98..f13d9dc 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -80,10 +80,10 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl))
$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
