diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
| commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
| tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/inc/unx/salunx.h | |
| parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'vcl/inc/unx/salunx.h')
| -rw-r--r-- | vcl/inc/unx/salunx.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h index 6e55285d3586..8e82258e51a2 100644 --- a/vcl/inc/unx/salunx.h +++ b/vcl/inc/unx/salunx.h @@ -68,7 +68,7 @@ inline int operator == ( const timeval &t1, const timeval &t2 ) { if( t1.tv_sec == t2.tv_sec ) return t1.tv_usec == t2.tv_usec; - return FALSE; + return sal_False; } inline timeval &operator -= ( timeval &t1, const timeval &t2 ) @@ -95,7 +95,7 @@ inline timeval &operator += ( timeval &t1, const timeval &t2 ) return t1; } -inline timeval &operator += ( timeval &t1, ULONG t2 ) +inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 ) { t1.tv_sec += t2 / 1000; t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500; @@ -113,7 +113,7 @@ inline timeval operator + ( const timeval &t1, const timeval &t2 ) return t0 += t2; } -inline timeval operator + ( const timeval &t1, ULONG t2 ) +inline timeval operator + ( const timeval &t1, sal_uIntPtr t2 ) { timeval t0 = t1; return t0 += t2; |