Changeset 45f7449 in mainline for uspace/lib/posix/include

Timestamp:

2013-03-31T19:46:19Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a5057cc

Parents:

582f4d28

Message:

Revert to the state of mainline,1783.

File:

• uspace/lib/posix/include/posix/string.h (modified) (1 diff)

uspace/lib/posix/include/posix/string.h

@@ -60 +60 @@
  * forward declarations ought to be enough.
  */
-
 /* From str.h. */
-
-extern char *strtok_r(char *, const char *, char **);
-extern char *strtok(char *, const char *);
+extern char * strtok_r(char *, const char *, char **);
+extern char * strtok(char *, const char *);
 
 /* From mem.h */
+#define bzero(ptr, len)  memset((ptr), 0, (len))
+extern void *memset(void *, int, size_t);
+extern void *memcpy(void *, const void *, size_t);
+extern void *memmove(void *, const void *, size_t);
 
-#define memset(dst, val, cnt)  __builtin_memset((dst), (val), (cnt))
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
-
-#define bzero(ptr, len)  memset((ptr), 0, (len))
-
-extern void *memmove(void *, const void *, size_t);
-extern int bcmp(const void *, const void *, size_t);
 
 /* Copying and Concatenation */