diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2012-08-13 11:21:13 +0200 |
|---|---|---|
| committer | Arnaud Versini <arnaud.versini@gmail.com> | 2012-08-14 16:18:05 +0200 |
| commit | 9a3d8ed28dc44743b6715cd8bac39b55762cba11 (patch) | |
| tree | 2755682e3e28998f7df4c2fa4fde1d7235e8c872 /vcl/unx | |
| parent | d26599c3e1dea940439985b46b727cfc22b37c38 (diff) | |
Replace usage of rtl/memory.h in vcl with equivalent from string.h
Change-Id: If8d460189c57f9c02923019e95bf47db1d96c716
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/app/sm.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index a76d0351ca2f..2414643a5f14 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -2391,7 +2391,7 @@ bool SalDisplay::XIfEventWithTimeout( XEvent* o_pEvent, XPointer i_pPredicateDat // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= SalVisual::SalVisual() { - rtl_zeroMemory( this, sizeof( SalVisual ) ); + memset( this, 0, sizeof( SalVisual ) ); } SalVisual::SalVisual( const XVisualInfo* pXVI ) diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 0122038a40fb..67e7db213bf5 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -637,7 +637,7 @@ void ICEConnectionWorker(void * data) nConnectionsBefore = pThis->m_nConnections; int nBytes = sizeof( struct pollfd )*(nConnectionsBefore+1); pLocalFD = (struct pollfd*)rtl_allocateMemory( nBytes ); - rtl_copyMemory( pLocalFD, pThis->m_pFilehandles, nBytes ); + memcpy( pLocalFD, pThis->m_pFilehandles, nBytes ); } int nRet = poll( pLocalFD,nConnectionsBefore+1,-1 ); diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 46f116939c48..c35aaec9ab91 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -36,7 +36,6 @@ #endif #include <osl/endian.h> -#include <rtl/memory.h> #include <vcl/bitmap.hxx> #include <vcl/salbtype.hxx> diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 9d744445bb14..ebed2d01a08a 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -188,7 +188,7 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode ) { XEvent aEvent; - rtl_zeroMemory( &aEvent, sizeof(aEvent) ); + memset( &aEvent, 0, sizeof(aEvent) ); aEvent.xclient.window = mhForeignParent; aEvent.xclient.type = ClientMessage; aEvent.xclient.message_type = pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::XEMBED ); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index a6f8e0d44e01..fdbc6dec7413 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1062,7 +1062,7 @@ void GtkSalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode ) #if !GTK_CHECK_VERSION(3,0,0) XEvent aEvent; - rtl_zeroMemory( &aEvent, sizeof(aEvent) ); + memset( &aEvent, 0, sizeof(aEvent) ); aEvent.xclient.window = m_aForeignParentWindow; aEvent.xclient.type = ClientMessage; aEvent.xclient.message_type = getDisplay()->getWMAdaptor()->getAtom( vcl_sal::WMAdaptor::XEMBED ); |