Changeset 1017 for trunk/src

Timestamp:

Jan 20, 2004, 2:35:09 AM (22 years ago)

Author:

bird

Message:

Think I got that mempcpy() right now.

Location:

trunk/src/emx

Files:

• include/string.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/str/386/mempcpy.s (modified) (3 diffs, 1 prop)

trunk/src/emx/include/string.h

@@ -172 +172 @@
  */
 #if __BSD_VISIBLE
-void * mempcpy(void *, const void *, size_t);
+void * __mempcpy(void *, const void *, size_t);
+#define mempcpy(d, s, n)    __mempcpy(d, s, n)
 #endif
 /* bird: GNU stuff - end */

trunk/src/emx/src/lib/libc.def

@@ -963 +963 @@
     "___toupper" @993
     "___locale_C" @994
-    "_mempcpy" @995
+    "___mempcpy" @995
 

trunk/src/emx/src/lib/str/386/mempcpy.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _STD(memcpy)
+        .globl ___mempcpy
 
 / void *mempcpy (void *s1, const void *s2, size_t n)
@@ -20 +20 @@
         ALIGN
 
-mempcpy:
+___mempcpy:
         PROFILE_NOFRAME
         pushl   %esi
@@ -37 +37 @@
         popl    %edi
         popl    %esi
-        EPILOGUE(mempcpy)
+        EPILOGUE(___mempcpy)