vcl/unx/generic/app/saldisp.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 8d31d285445aa103289fc1a65ec0ecd8ff606bec Author: Stephan Bergmann <[email protected]> Date: Mon Dec 19 18:09:12 2016 +0100 -fsanitize=function (SAL_USE_VCLPLUGIN=gen) Change-Id: Iba67eb8dc0cb40e8663ad04fc96201072d3aeabe diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 34f0e6f..ab4c73d 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" ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
