diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-09-02 17:08:40 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-09-02 17:08:40 -0500 |
| commit | f761b005481b72f1aa43dd2bf1d4bebac62dbab2 (patch) | |
| tree | 84cd50fbb60e0adeebab0989e8396d8a79d60558 /sal/rtl | |
| parent | 1bf008c67f91aed39bcc29985f3c7b6d534718d7 (diff) | |
MacOSX 10.6 does not like id as a variable name
Change-Id: Id1029f777e4f1d03ce7d3fb85ced38deeefca619
Diffstat (limited to 'sal/rtl')
| -rw-r--r-- | sal/rtl/random.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx index e8e77096288d..447ded5a23c6 100644 --- a/sal/rtl/random.cxx +++ b/sal/rtl/random.cxx @@ -113,7 +113,7 @@ static sal_Bool __rtl_random_initPool (RandomPool_Impl *pImpl) pImpl->m_hDigest = rtl_digest_create (RTL_RANDOM_DIGEST); if (pImpl->m_hDigest) { - oslThreadIdentifier id; + oslThreadIdentifier tid; TimeValue tv; RandomData_Impl rd; double seed; @@ -124,21 +124,21 @@ static sal_Bool __rtl_random_initPool (RandomPool_Impl *pImpl) */ /* - __rtl_random_seedPool (pImpl, (sal_uInt8*)&id, sizeof(id)); + __rtl_random_seedPool (pImpl, (sal_uInt8*)&tid, sizeof(tid)); __rtl_random_seedPool (pImpl, (sal_uInt8*)&tv, sizeof(tv)); __rtl_random_seedPool (pImpl, (sal_uInt8*)&rd, sizeof(rd)); */ - id = osl::Thread::getCurrentIdentifier(); - id = RTL_RANDOM_RNG_2(RTL_RANDOM_RNG_1(id)); - __rtl_random_seedPool (pImpl, (sal_uInt8*)&id, sizeof(id)); + tid = osl::Thread::getCurrentIdentifier(); + tid = RTL_RANDOM_RNG_2(RTL_RANDOM_RNG_1(tid)); + __rtl_random_seedPool (pImpl, (sal_uInt8*)&tid, sizeof(tid)); osl_getSystemTime (&tv); tv.Seconds = RTL_RANDOM_RNG_2(tv.Seconds); tv.Nanosec = RTL_RANDOM_RNG_2(tv.Nanosec); __rtl_random_seedPool (pImpl, (sal_uInt8*)&tv, sizeof(tv)); - rd.m_nX = (sal_Int16)(((id >> 1) << 1) + 1); + rd.m_nX = (sal_Int16)(((tid >> 1) << 1) + 1); rd.m_nY = (sal_Int16)(((tv.Seconds >> 1) << 1) + 1); rd.m_nZ = (sal_Int16)(((tv.Nanosec >> 1) << 1) + 1); __rtl_random_seedPool (pImpl, (sal_uInt8*)&rd, sizeof(rd)); |