diff options
Diffstat (limited to 'sal/qa/osl/security/osl_Security_Const.h')
| -rw-r--r-- | sal/qa/osl/security/osl_Security_Const.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 9298324a5..197745f7d 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -63,11 +63,15 @@ const char pTestString[17] = "Sun Microsystems"; //------------------------------------------------------------------------ // condition names //------------------------------------------------------------------------ -OSLTEST_DECLARE_USTRING( NullURL, "" ); -::rtl::OUString aLogonUser( aNullURL ), aLogonPasswd( aNullURL ), aFileServer( aNullURL ), aStringForward( aNullURL ); -::rtl::OUString strUserName( aNullURL ) , strComputerName( aNullURL ) , strHomeDirectory( aNullURL ); -::rtl::OUString strConfigDirectory( aNullURL ), strUserID( aNullURL ); +// Intentionally different from the aNullURL in osl_File_Const.h to avoid +// duplicate symbols as all the unit tests here get linked together for iOS... + +OSLTEST_DECLARE_USTRING( NullUrl, "" ); + +::rtl::OUString aLogonUser( aNullUrl ), aLogonPasswd( aNullUrl ), aFileServer( aNullUrl ), aStringForward( aNullUrl ); +::rtl::OUString strUserName( aNullUrl ) , strComputerName( aNullUrl ) , strHomeDirectory( aNullUrl ); +::rtl::OUString strConfigDirectory( aNullUrl ), strUserID( aNullUrl ); sal_Bool isAdmin = sal_False; |