summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-12-19 18:09:12 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-12-19 18:09:12 +0100
commit8d31d285445aa103289fc1a65ec0ecd8ff606bec (patch)
treecaff57e7c91260ca71ed468d048469fc522a98ce
parent2eb121bd153c77725b759d457721efc39e5f21f6 (diff)
-fsanitize=function (SAL_USE_VCLPLUGIN=gen)
Change-Id: Iba67eb8dc0cb40e8663ad04fc96201072d3aeabe
-rw-r--r--vcl/unx/generic/app/saldisp.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 34f0e6f73968..ab4c73dcb077 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -371,9 +371,9 @@ void SalDisplay::doDestruct()
pData->SetDisplay( nullptr );
}
-static int DisplayHasEvent( int fd, SalX11Display *pDisplay )
+static int DisplayHasEvent( int fd, void * data )
{
- (void)fd;
+ auto pDisplay = static_cast<SalX11Display *>(data);
SAL_WARN_IF( ConnectionNumber( pDisplay->GetDisplay() ) != fd, "vcl",
"wrong fd in DisplayHasEvent" );
if( ! pDisplay->IsDisplay() )
@@ -386,9 +386,9 @@ static int DisplayHasEvent( int fd, SalX11Display *pDisplay )
GetSalData()->m_pInstance->GetYieldMutex()->release();
return int(result);
}
-static int DisplayQueue( int fd, SalX11Display *pDisplay )
+static int DisplayQueue( int fd, void * data )
{
- (void)fd;
+ auto pDisplay = static_cast<SalX11Display *>(data);
SAL_WARN_IF( ConnectionNumber( pDisplay->GetDisplay() ) != fd, "vcl",
"wrong fd in DisplayHasEvent" );
int result;
@@ -400,9 +400,9 @@ static int DisplayQueue( int fd, SalX11Display *pDisplay )
return result;
}
-static int DisplayYield( int fd, SalX11Display *pDisplay )
+static int DisplayYield( int fd, void * data )
{
- (void)fd;
+ auto pDisplay = static_cast<SalX11Display *>(data);
SAL_WARN_IF( ConnectionNumber( pDisplay->GetDisplay() ) != fd, "vcl",
"wrong fd in DisplayHasEvent" );