View | Details | Raw Unified | Return to issue 126890
Collapse All | Expand All

(-)main/set_soenv.in (-1 / +3 lines)
Lines 1380-1386 Link Here
1380
                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.
1380
                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.
1381
                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
1381
                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
1382
                        $I.'$SOLARENV'.$INC.
1382
                        $I.'$SOLARENV'.$INC.
1383
                        $I.'$SRC_ROOT'.$ds."res";
1383
                        $I.'$SRC_ROOT'.$ds."res".
1384
                        $I.'$SRC_ROOT'.$ds."tools".$INC.
1385
                        $I.'$SRC_ROOT'.$ds."comphelper".$INC;
1384
1386
1385
if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
1387
if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
1386
{
1388
{
(-)main/sal/inc/rtl/string.hxx (+5 lines)
Lines 32-37 Link Here
32
#include <rtl/memory.h>
32
#include <rtl/memory.h>
33
#include <rtl/textenc.h>
33
#include <rtl/textenc.h>
34
#include <rtl/string.h>
34
#include <rtl/string.h>
35
#ifdef DBG_UTIL
36
#include <tools/debug.hxx>
37
#endif /* DBG_UTIL */
35
38
36
#if !defined EXCEPTIONS_OFF
39
#if !defined EXCEPTIONS_OFF
37
#include <new>
40
#include <new>
Lines 969-976 Link Here
969
/* Helper methods to support OString messages in OSL_ENSURE, DBG_ERROR, DBG_WARN, DBG_TRACE, etc. */
972
/* Helper methods to support OString messages in OSL_ENSURE, DBG_ERROR, DBG_WARN, DBG_TRACE, etc. */
970
inline sal_Bool SAL_CALL osl_assertFailedLine( const sal_Char* pszFileName, sal_Int32 nLine, const ::rtl::OString& rMessage)
973
inline sal_Bool SAL_CALL osl_assertFailedLine( const sal_Char* pszFileName, sal_Int32 nLine, const ::rtl::OString& rMessage)
971
	{ return osl_assertFailedLine( pszFileName, nLine, rMessage.getStr()); }
974
	{ return osl_assertFailedLine( pszFileName, nLine, rMessage.getStr()); }
975
#ifdef DBG_UTIL
972
inline void DbgOut( const rtl::OString& rMessage, sal_uInt16 nOutType, const sal_Char* pFileName, sal_uInt16 nLineNum )
976
inline void DbgOut( const rtl::OString& rMessage, sal_uInt16 nOutType, const sal_Char* pFileName, sal_uInt16 nLineNum )
973
	{ DbgOut( rMessage.getStr(), nOutType, pFileName, nLineNum); }
977
	{ DbgOut( rMessage.getStr(), nOutType, pFileName, nLineNum); }
978
#endif /* DBG_UTIL */
974
979
975
#endif /* __cplusplus */
980
#endif /* __cplusplus */
976
981

Return to issue 126890