svn commit: branches/uClibc-nptl/ldso/include

sjhill at uclibc.org sjhill at uclibc.org
Fri Sep 23 03:17:19 UTC 2005


Author: sjhill
Date: 2005-09-22 20:17:18 -0700 (Thu, 22 Sep 2005)
New Revision: 11586

Log:
Sync.


Modified:
   branches/uClibc-nptl/ldso/include/dl-string.h


Changeset:
Modified: branches/uClibc-nptl/ldso/include/dl-string.h
===================================================================
--- branches/uClibc-nptl/ldso/include/dl-string.h	2005-09-23 03:15:09 UTC (rev 11585)
+++ branches/uClibc-nptl/ldso/include/dl-string.h	2005-09-23 03:17:18 UTC (rev 11586)
@@ -13,7 +13,6 @@
 static char *_dl_strrchr(const char *str, int c);
 static char *_dl_strstr(const char *s1, const char *s2);
 static void * _dl_memcpy(void * dst, const void * src, size_t len);
-static void * _dl_mempcpy(void * dst, const void * src, size_t len);
 static int _dl_memcmp(const void * s1,const void * s2,size_t len);
 static void *_dl_memset(void * str,int c,size_t len);
 static char *_dl_get_last_path_component(char *path);
@@ -135,7 +134,7 @@
     } while (1);
 }
 
-static inline void * _dl_memcpy(void * dst, const void * src, size_t len)
+static __always_inline void * _dl_memcpy(void * dst, const void * src, size_t len)
 {
 	register char *a = dst-1;
 	register const char *b = src-1;
@@ -147,12 +146,6 @@
 	return dst;
 }
 
-static inline void * _dl_mempcpy(void * dst, const void * src, size_t len)
-{
-	_dl_memcpy(dst, src, len);
-	return (void *)(((char *) dst) + len);
-}
-
 static __always_inline int _dl_memcmp(const void * s1,const void * s2,size_t len)
 {
 	unsigned char *c1 = (unsigned char *)s1-1;




More information about the uClibc-cvs mailing list