Changeset 25a76ab8 in mainline for boot/generic/include/memstr.h

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/generic/include/memstr.h (moved) (moved from boot/generic/memstr.h ) (3 diffs)

boot/generic/include/memstr.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Martin Decky
+ * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic
- * @{
- */
 /** @file
  */
@@ -36 +33 @@
 #define BOOT_MEMSTR_H_
 
-extern void memcpy(void *dst, const void *src, unsigned int cnt);
+#include <typedefs.h>
+
+extern void *memcpy(void *, const void *, size_t);
 
 #endif