summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-02-22 15:34:30 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-02-22 15:34:30 +0000
commit3e4d9d9d1e9fa62287df84bf7982a96290e1377a (patch)
treee9ae2451fbd5097aeb78eb4a36f33bf486d71bb7 /sal
parentb96371442e281d7403ebfb08cdb53f8e6885135e (diff)
get to build under windows
Diffstat (limited to 'sal')
-rw-r--r--sal/qa/osl/security/osl_Security.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 6fd76222d5ab..61013d85ad3f 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -546,21 +546,21 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
{
dwSidSize+=wsprintf(Ident + strlen(Ident),
TEXT("0x%02hx%02hx%02hx%02hx%02hx%02hx"),
- (USHORT)psia->Value[0],
- (USHORT)psia->Value[1],
- (USHORT)psia->Value[2],
- (USHORT)psia->Value[3],
- (USHORT)psia->Value[4],
- (USHORT)psia->Value[5]);
+ (sal_uInt16)psia->Value[0],
+ (sal_uInt16)psia->Value[1],
+ (sal_uInt16)psia->Value[2],
+ (sal_uInt16)psia->Value[3],
+ (sal_uInt16)psia->Value[4],
+ (sal_uInt16)psia->Value[5]);
}
else
{
dwSidSize+=wsprintf(Ident + strlen(Ident),
TEXT("%lu"),
- (ULONG)(psia->Value[5] ) +
- (ULONG)(psia->Value[4] << 8) +
- (ULONG)(psia->Value[3] << 16) +
- (ULONG)(psia->Value[2] << 24) );
+ (sal_uInt32)(psia->Value[5] ) +
+ (sal_uInt32)(psia->Value[4] << 8) +
+ (sal_uInt32)(psia->Value[3] << 16) +
+ (sal_uInt32)(psia->Value[2] << 24) );
}
/* loop through SidSubAuthorities */