INTEGRATION: CWS ooo64bit01 (1.1.1.1.274); FILE MERGED

2004/03/16 23:54:13 fa 1.1.1.1.274.1: Merge cws_srx644_port64bit, other misc fixes

1 files changed, 8 insertions, 36 deletions

diff --git a/sal/rtl/source/memory.c b/sal/rtl/source/memory.c
index ea31af3db75b..b6b17d8adf05 100644
--- a/sal/rtl/source/memory.c
+++ b/sal/rtl/source/memory.c
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: memory.c,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:17:24 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 13:28:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,65 +60,37 @@
  ************************************************************************/
 
 
-#ifndef MAC
-#include <memory.h>
-#endif
 #include <string.h>
-
 #include <rtl/memory.h>
 
-void SAL_CALL rtl_zeroMemory(void *Ptr, sal_uInt32 Bytes)
+void SAL_CALL rtl_zeroMemory(void *Ptr, sal_Size Bytes)
 {
-#ifdef _WIN16
-    _fmemset(Ptr, 0, Bytes);
-#else
     memset(Ptr, 0, Bytes);
-#endif
 }
 
-void SAL_CALL rtl_fillMemory(void *Ptr, sal_uInt32 Bytes, sal_uInt8 Fill)
+void SAL_CALL rtl_fillMemory(void *Ptr, sal_Size Bytes, sal_uInt8 Fill)
 {
-#ifdef _WIN16
-    _fmemset(Ptr, Fill, Bytes);
-#else
     memset(Ptr, Fill, Bytes);
-#endif
 }
 
-void SAL_CALL rtl_copyMemory(void *Dst, const void *Src, sal_uInt32 Bytes)
+void SAL_CALL rtl_copyMemory(void *Dst, const void *Src, sal_Size Bytes)
 {
-#ifdef _WIN16
-    _fmemcpy(Dst, Src, Bytes);
-#else
     memcpy(Dst, Src, Bytes);
-#endif
 }
 
-void SAL_CALL rtl_moveMemory(void *Dst, const void *Src, sal_uInt32 Bytes)
+void SAL_CALL rtl_moveMemory(void *Dst, const void *Src, sal_Size Bytes)
 {
-#ifdef _WIN16
-    _fmemmove(Dst, Src, Bytes);
-#else
     memmove(Dst, Src, Bytes);
-#endif
 }
 
-sal_Int32 SAL_CALL rtl_compareMemory(const void *MemA, const void *MemB, sal_uInt32 Bytes)
+sal_Int32 SAL_CALL rtl_compareMemory(const void *MemA, const void *MemB, sal_Size Bytes)
 {
-#ifdef _WIN16
-    return _fmemcmp(MemA, MemB, Bytes);
-#else
     return memcmp(MemA, MemB, Bytes);
-#endif
 }
 
-void* SAL_CALL rtl_findInMemory(const void *MemA, sal_uInt8 ch, sal_uInt32 Bytes)
+void* SAL_CALL rtl_findInMemory(const void *MemA, sal_uInt8 ch, sal_Size Bytes)
 {
-#ifdef _WIN16
-    return _fmemchr(MemA, ch, Bytes);
-#else
     return memchr(MemA, ch, Bytes);
-#endif
 }