diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
commit | 386551b1fcd13fef876bcd85ae378b6470593a5f (patch) | |
tree | 17b446dffd0efe9304c1f9c3b41c0a545d875080 | |
parent | d11e75f0bf46a110fa2fb7a41a5d2ffcd0e82722 (diff) |
CWS-TOOLING: integrate CWS sb102
2008-12-11 16:18:12 +0100 sb r265332 : #i95065# cleanup, to make Windows linking work
2008-12-11 16:16:03 +0100 sb r265331 : #i95065# missing SAL_DLLPUBLIC_EXPORT
2008-12-09 17:40:28 +0100 sb r265122 : #i94469# move CJK specific configuration data to brand layer
2008-12-09 16:09:08 +0100 sb r265112 : #i96959# use PTHREAD_MUTEX_RECURSIVE on all platforms
2008-12-09 15:54:31 +0100 sb r265110 : #i95065# do not derive apphelper::LifeTimeGuard from osl::ResettableMutexGuard to avoid problems with VISIBILITY_HIDDEN=TRUE on MSC
2008-12-09 15:40:51 +0100 sb r265104 : #i95065# add VISIBILITY_HIDDEN=TRUE to connectivity/source/drivers/mozab
2008-12-09 15:36:21 +0100 sb r265102 : #i95501# updated SDK_HOME
2008-12-09 15:31:46 +0100 sb r265099 : typo (temppath vs. tmppath)
2008-12-08 11:48:08 +0100 sb r264979 : #i95065# removed spurious ExplicitCategoriesProvider.obj (ExplicitCategoriesProvider.cxx is not in this directory)
2008-12-07 19:41:07 +0100 sb r264960 : #i96994# erroneously doubled backslash caused visibility feature to be disabled for all GCC versions on Mac OS X
2008-12-06 23:54:49 +0100 sb r264948 : changes from trunk that CWS-TOOLING's rebase to DEV300:m37 (r264891) had missed, as files had been moved around on this CWS
2008-12-05 20:29:23 +0100 sb r264919 : #i85508# versions of flex apparently differ in whether input() resp. yyinput() returns zero or EOF upon end of file
2008-12-05 15:37:23 +0100 sb r264908 : #i95315# removed obsolete jut
2008-12-05 15:34:59 +0100 sb r264907 : #i95531# removed empty obsolete directories
2008-12-05 10:09:23 +0100 sb r264891 : CWS-TOOLING: rebase CWS sb102 to trunk@264807 (milestone: DEV300:m37)
2008-12-04 14:50:20 +0100 sb r264845 : #i95065# introduced VISIBILITY_HIDDEN makefile flag to reduce duplications; made additional libraries use VISIBILITY_HIDDEN=TRUE to avoid warnings with recent GCC 4 versions (had to split certain code directories to make changes that would otherwise erroneously affect multiple libraries built in the same makefile); changed connectivity::ORefVector to no longer derive from std::vector, as that caused problems with the MSC implementation of VISIBILITY_HIDDEN=TRUE; replaced uses of JNIEXPORT with SAL_DLLPUBLIC_EXPORT, as the former does not expand to visibility attributes on some platforms where the latter does
2008-12-03 11:29:38 +0100 sb r264759 : #i94583# remove unnecessary (and wrong) assertion check for rtl_getAppCommandArg return value (which is guaranteed to return osl_Process_E_None or not return at all)
2008-12-02 17:18:31 +0100 sb r264724 : #i96809# silenced GCC 4.3.2 warning
2008-12-02 13:29:34 +0100 sb r264695 : #i96797# make get_tmp_dir fail less often
2008-11-28 17:19:24 +0100 sb r264566 : #i95691# inadvertently missing from -c 264564
2008-11-28 17:07:50 +0100 sb r264564 : #i95691# only structs of exactly 1, 2, 4, or 8 bytes are returned through registers
2008-11-25 13:28:08 +0100 sb r264291 : #i96427# support for SAL_EXCEPTION_DLLPUBLIC_EXPORT (patch by np)
2008-11-21 14:45:22 +0100 sb r264140 : #i95428# added SAL_EXCEPTION_DLLPUBLIC_EXPORT and SAL_EXCEPTION_DLLPRIVATE
2008-11-19 13:19:37 +0100 sb r263984 : #i95525# removed erroneous application/octet-stream svn:mime-type properties
-rw-r--r-- | comphelper/inc/comphelper/componentmodule.hxx | 7 | ||||
-rw-r--r-- | comphelper/util/makefile.pmk | 13 | ||||
-rw-r--r-- | i18npool/util/makefile.pmk | 13 | ||||
-rw-r--r-- | sax/util/makefile.pmk | 6 | ||||
-rw-r--r-- | sot/util/makefile.pmk | 14 | ||||
-rw-r--r-- | svtools/uno/makefile.mk | 1 | ||||
-rw-r--r-- | svtools/util/svl.pmk | 13 | ||||
-rw-r--r-- | svtools/util/svt.pmk | 13 | ||||
-rw-r--r-- | svtools/workben/unodialog/makefile.mk | 1 | ||||
-rw-r--r-- | toolkit/util/makefile.pmk | 6 | ||||
-rw-r--r-- | tools/util/makefile.pmk | 13 | ||||
-rw-r--r-- | ucbhelper/util/makefile.pmk | 13 | ||||
-rw-r--r-- | unotools/util/makefile.pmk | 13 | ||||
-rw-r--r-- | vcl/util/makefile2.pmk | 6 |
14 files changed, 17 insertions, 115 deletions
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx index 25b6315ee40b..9e136072a73e 100644 --- a/comphelper/inc/comphelper/componentmodule.hxx +++ b/comphelper/inc/comphelper/componentmodule.hxx @@ -417,18 +417,19 @@ namespace comphelper //= implementing the API of a component library (component_*) #define IMPLEMENT_COMPONENT_LIBRARY_API( module_class, initializer_function ) \ - extern "C" void SAL_CALL component_getImplementationEnvironment( \ + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL \ + component_getImplementationEnvironment( \ const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) \ { \ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \ } \ - extern "C" sal_Bool SAL_CALL component_writeInfo( \ + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( \ void* pServiceManager, void* pRegistryKey ) \ { \ initializer_function(); \ return module_class::getInstance().writeComponentInfos( pServiceManager, pRegistryKey ); \ } \ - extern "C" void* SAL_CALL component_getFactory( \ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( \ const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) \ { \ initializer_function(); \ diff --git a/comphelper/util/makefile.pmk b/comphelper/util/makefile.pmk index 464db5f1f083..fa057a4986a4 100644 --- a/comphelper/util/makefile.pmk +++ b/comphelper/util/makefile.pmk @@ -36,15 +36,4 @@ STL_OS2_BUILDING=1 # define COMPHELPER_DLLIMPLEMENTATION (see @ comphelperdllapi.h) CDEFS += -DCOMPHELPER_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/i18npool/util/makefile.pmk b/i18npool/util/makefile.pmk index 04c8491eb172..8d4084233e1a 100644 --- a/i18npool/util/makefile.pmk +++ b/i18npool/util/makefile.pmk @@ -32,15 +32,4 @@ # define I18NPOOL_DLLIMPLEMENTATION (see @ i18npool/i18npooldllapi.h) CDEFS += -DI18NPOOL_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/sax/util/makefile.pmk b/sax/util/makefile.pmk index 4130b4071428..cfb446dde5d4 100644 --- a/sax/util/makefile.pmk +++ b/sax/util/makefile.pmk @@ -31,8 +31,4 @@ # Reduction of exported symbols: CDEFS += -DSAX_DLLIMPLEMENTATION -.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGS += -fvisibility=hidden -.ELIF "$(COMNAME)" == "sunpro5" && "$(CCNUMVER)" >= "00050005" -CFLAGS += -xldscope=hidden -.ENDIF +VISIBILITY_HIDDEN=TRUE diff --git a/sot/util/makefile.pmk b/sot/util/makefile.pmk index 5653efa692e4..939d66818cd0 100644 --- a/sot/util/makefile.pmk +++ b/sot/util/makefile.pmk @@ -31,17 +31,5 @@ # define SOT_DLLIMPLEMENTATION (see @ = sotdllapi.h) CDEFS += -DSOT_DLLIMPLEMENTATION - -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/svtools/uno/makefile.mk b/svtools/uno/makefile.mk index 346ecf9886bb..8f61c7100508 100644 --- a/svtools/uno/makefile.mk +++ b/svtools/uno/makefile.mk @@ -34,6 +34,7 @@ PRJNAME=svtools TARGET=svtmisc.uno LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- diff --git a/svtools/util/svl.pmk b/svtools/util/svl.pmk index ce70138b375e..aec76257e743 100644 --- a/svtools/util/svl.pmk +++ b/svtools/util/svl.pmk @@ -32,15 +32,4 @@ # define SVL_DLLIMPLEMENTATION (see @ svldllapi.h) CDEFS += -DSVL_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/svtools/util/svt.pmk b/svtools/util/svt.pmk index 9060e29f91d9..5f36197ce089 100644 --- a/svtools/util/svt.pmk +++ b/svtools/util/svt.pmk @@ -32,15 +32,4 @@ # define SVT_DLLIMPLEMENTATION (see @ svtdllapi.h) CDEFS += -DSVT_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/svtools/workben/unodialog/makefile.mk b/svtools/workben/unodialog/makefile.mk index 098acfd979a0..c6cd6e5d8491 100644 --- a/svtools/workben/unodialog/makefile.mk +++ b/svtools/workben/unodialog/makefile.mk @@ -36,6 +36,7 @@ TARGET=udlg USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- diff --git a/toolkit/util/makefile.pmk b/toolkit/util/makefile.pmk index 49da9b4fc2c0..8bb9f5d4bc28 100644 --- a/toolkit/util/makefile.pmk +++ b/toolkit/util/makefile.pmk @@ -31,11 +31,7 @@ # Reduction of exported symbols: CDEFS += -DTOOLKIT_DLLIMPLEMENTATION -.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGS += -fvisibility=hidden -.ELIF "$(COMNAME)" == "sunpro5" && "$(CCNUMVER)" >= "00050005" -CFLAGS += -xldscope=hidden -.ENDIF +VISIBILITY_HIDDEN=TRUE # FIXME: sprinkle some TOOLKIT_DLLPUBLIC diff --git a/tools/util/makefile.pmk b/tools/util/makefile.pmk index e00a3ba5df87..09d9908a5049 100644 --- a/tools/util/makefile.pmk +++ b/tools/util/makefile.pmk @@ -32,15 +32,4 @@ # define TOOLS_DLLIMPLEMENTATION (see @ toolsdllapi.h) CDEFS += -DTOOLS_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/ucbhelper/util/makefile.pmk b/ucbhelper/util/makefile.pmk index 836165aa7f8d..23f38aa614e5 100644 --- a/ucbhelper/util/makefile.pmk +++ b/ucbhelper/util/makefile.pmk @@ -32,15 +32,4 @@ # define UCBHELPER_DLLIMPLEMENTATION (see @ ucbhelperdllapi.h) CDEFS += -DUCBHELPER_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/unotools/util/makefile.pmk b/unotools/util/makefile.pmk index d24326884699..a59b857ac7b2 100644 --- a/unotools/util/makefile.pmk +++ b/unotools/util/makefile.pmk @@ -32,15 +32,4 @@ # define UNOTOOLS_DLLIMPLEMENTATION (see @ unotoolsdllapi.h) CDEFS += -DUNOTOOLS_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk index 8da0f6e559cb..0e57d7aeb80b 100644 --- a/vcl/util/makefile2.pmk +++ b/vcl/util/makefile2.pmk @@ -31,11 +31,7 @@ # Reduction of exported symbols: CDEFS += -DVCL_DLLIMPLEMENTATION -.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGS += -fvisibility=hidden -.ELIF "$(COMNAME)" == "sunpro5" && "$(CCNUMVER)" >= "00050005" -CFLAGS += -xldscope=hidden -.ENDIF +VISIBILITY_HIDDEN=TRUE .IF "$(GUIBASE)"=="aqua" OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions |