diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-28 15:23:46 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:36:12 +0200 |
| commit | 16f09b72e235f3763d3822357bac6013ee9d965b (patch) | |
| tree | 1f8b90941e80e12a71a1f419642e3f2c853b4e7e | |
| parent | 22e8f9b907d4ec183adfecbae279a1039b6f571d (diff) | |
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
| -rw-r--r-- | shell/Library_ooofilt.mk | 8 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 8 | ||||
| -rw-r--r-- | shell/Library_propertyhdl.mk | 4 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 4 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 8 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 8 |
6 files changed, 20 insertions, 20 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 35e3662147e7..af30efb7fd9b 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 ca779ff06b4b..7620d520f837 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 8b7d7ff732b4..4d701cd781d8 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 c84738b92fa9..f613bd358c22 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 c546db6101ff..b8df8a93cbb5 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 d1e2d984df1f..f13d9dc8bd14 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,\ |