Changeset 4805495 in mainline for uspace/lib/c/generic

Timestamp:

2019-02-11T15:01:33Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab936440, d5a89a3, fc448f5

Parents:

8df5f20

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 23:30:11)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-11 15:01:33)

Message:

Make sure libc and abi header guards are reserved identifiers

It's only needed for a small subset that end up included from standard
headers, but for consistency this changes all of them.

Location:

uspace/lib/c/generic

Files:

• async/client.c (modified) (1 diff)
• async/ports.c (modified) (1 diff)
• async/server.c (modified) (1 diff)
• private/async.h (modified) (1 diff)
• private/cc.h (modified) (1 diff)
• private/fibril.h (modified) (1 diff)
• private/futex.h (modified) (1 diff)
• private/io.h (modified) (1 diff)
• private/libc.h (modified) (1 diff)
• private/loader.h (modified) (1 diff)
• private/malloc.h (modified) (1 diff)
• private/ns.h (modified) (1 diff)
• private/scanf.h (modified) (1 diff)
• private/sstream.h (modified) (1 diff)
• private/stdio.h (modified) (1 diff)
• private/stdlib.h (modified) (1 diff)
• private/thread.h (modified) (1 diff)

uspace/lib/c/generic/async/client.c

@@ -95 +95 @@
  */
 
-#define LIBC_ASYNC_C_
+#define _LIBC_ASYNC_C_
 #include <ipc/ipc.h>
 #include <async.h>
 #include "../private/async.h"
 #include "../private/ns.h"
-#undef LIBC_ASYNC_C_
+#undef _LIBC_ASYNC_C_
 
 #include <ipc/irq.h>

uspace/lib/c/generic/async/ports.c

@@ -27 +27 @@
  */
 
-#define LIBC_ASYNC_C_
+#define _LIBC_ASYNC_C_
 #include <ipc/ipc.h>
 #include <async.h>
 #include "../private/async.h"
-#undef LIBC_ASYNC_C_
+#undef _LIBC_ASYNC_C_
 
 #include <ipc/irq.h>

uspace/lib/c/generic/async/server.c

@@ -96 +96 @@
  */
 
-#define LIBC_ASYNC_C_
+#define _LIBC_ASYNC_C_
 #include <ipc/ipc.h>
 #include <async.h>
 #include "../private/async.h"
-#undef LIBC_ASYNC_C_
+#undef _LIBC_ASYNC_C_
 
 #include <ipc/irq.h>

uspace/lib/c/generic/private/async.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_ASYNC_H_
-#define LIBC_PRIVATE_ASYNC_H_
+#ifndef _LIBC_PRIVATE_ASYNC_H_
+#define _LIBC_PRIVATE_ASYNC_H_
 
 #include <async.h>

uspace/lib/c/generic/private/cc.h

@@ -34 +34 @@
  */
 
-#ifndef LIBC_CC_H_
-#define LIBC_CC_H_
+#ifndef _LIBC_CC_H_
+#define _LIBC_CC_H_
 
 #ifndef __clang__

uspace/lib/c/generic/private/fibril.h

@@ -27 +27 @@
  */
 
-#ifndef LIBC_PRIVATE_FIBRIL_H_
-#define LIBC_PRIVATE_FIBRIL_H_
+#ifndef _LIBC_PRIVATE_FIBRIL_H_
+#define _LIBC_PRIVATE_FIBRIL_H_
 
 #include <adt/list.h>

uspace/lib/c/generic/private/futex.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_FUTEX_H_
-#define LIBC_FUTEX_H_
+#ifndef _LIBC_FUTEX_H_
+#define _LIBC_FUTEX_H_
 
 #include <assert.h>

uspace/lib/c/generic/private/io.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_IO_H_
-#define LIBC_PRIVATE_IO_H_
+#ifndef _LIBC_PRIVATE_IO_H_
+#define _LIBC_PRIVATE_IO_H_
 
 #include <loader/pcb.h>

uspace/lib/c/generic/private/libc.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_LIBC_H_
-#define LIBC_PRIVATE_LIBC_H_
+#ifndef _LIBC_PRIVATE_LIBC_H_
+#define _LIBC_PRIVATE_LIBC_H_
 
 #include <types/common.h>

uspace/lib/c/generic/private/loader.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_LOADER_H_
-#define LIBC_PRIVATE_LOADER_H_
+#ifndef _LIBC_PRIVATE_LOADER_H_
+#define _LIBC_PRIVATE_LOADER_H_
 
 #include <loader/loader.h>

uspace/lib/c/generic/private/malloc.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_MALLOC_H_
-#define LIBC_PRIVATE_MALLOC_H_
+#ifndef _LIBC_PRIVATE_MALLOC_H_
+#define _LIBC_PRIVATE_MALLOC_H_
 
 extern void __malloc_init(void);

uspace/lib/c/generic/private/ns.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_NS_H_
-#define LIBC_PRIVATE_NS_H_
+#ifndef _LIBC_PRIVATE_NS_H_
+#define _LIBC_PRIVATE_NS_H_
 
 #include <async.h>

uspace/lib/c/generic/private/scanf.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_SCANF_H_
-#define LIBC_PRIVATE_SCANF_H_
+#ifndef _LIBC_PRIVATE_SCANF_H_
+#define _LIBC_PRIVATE_SCANF_H_
 
 #include <stddef.h>

uspace/lib/c/generic/private/sstream.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_SSTREAM_H_
-#define LIBC_PRIVATE_SSTREAM_H_
+#ifndef _LIBC_PRIVATE_SSTREAM_H_
+#define _LIBC_PRIVATE_SSTREAM_H_
 
 #include <stdio.h>

uspace/lib/c/generic/private/stdio.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_STDIO_H_
-#define LIBC_PRIVATE_STDIO_H_
+#ifndef _LIBC_PRIVATE_STDIO_H_
+#define _LIBC_PRIVATE_STDIO_H_
 
 #include <adt/list.h>

uspace/lib/c/generic/private/stdlib.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_STDLIB_H_
-#define LIBC_PRIVATE_STDLIB_H_
+#ifndef _LIBC_PRIVATE_STDLIB_H_
+#define _LIBC_PRIVATE_STDLIB_H_
 
 #include <adt/list.h>

uspace/lib/c/generic/private/thread.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_PRIVATE_THREAD_H_
-#define LIBC_PRIVATE_THREAD_H_
+#ifndef _LIBC_PRIVATE_THREAD_H_
+#define _LIBC_PRIVATE_THREAD_H_
 
 #include <time.h>