Changeset bc73be3 in mainline for uspace/lib/c/include/mem.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• uspace/lib/c/include/mem.h (modified) (2 diffs)

uspace/lib/c/include/mem.h

@@ -34 +34 @@
  */
 
-#ifndef LIBC_MEM_H_
-#define LIBC_MEM_H_
+#ifndef _LIBC_MEM_H_
+#define _LIBC_MEM_H_
 
 #include <stddef.h>
-#include <cc.h>
+#include <_bits/decls.h>
+
+__C_DECLS_BEGIN;
 
 extern void *memset(void *, int, size_t)
-    __attribute__((nonnull(1)))
-    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns");
+    __attribute__((nonnull(1)));
 extern void *memcpy(void *, const void *, size_t)
-    __attribute__((nonnull(1, 2)))
-    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns");
+    __attribute__((nonnull(1, 2)));
 extern void *memmove(void *, const void *, size_t)
     __attribute__((nonnull(1, 2)));
@@ -53 +53 @@
     __attribute__((nonnull(1)));
 
+__C_DECLS_END;
+
 #endif