From c3cf06f1a3a9b9ee8ac7a0ae505f95c45f7dca84 Mon Sep 17 00:00:00 2001
From: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Date: Thu, 8 Nov 2018 10:20:19 +0000
Subject: Standardise header guards across codebase

All identifiers, regardless of use, that start with two underscores are
reserved. This means they can't be used in header guards.

The style that this project is now to use the full name of the file in
capital letters followed by 'H'. For example, for a file called
"uart_example.h", the header guard is UART_EXAMPLE_H.

The exceptions are files that are imported from other projects:

- CryptoCell driver
- dt-bindings folders
- zlib headers

Change-Id: I50561bf6c88b491ec440d0c8385c74650f3c106e
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
---
 include/lib/libc/aarch32/endian_.h | 6 +++---
 include/lib/libc/aarch32/stddef_.h | 5 +++++
 include/lib/libc/aarch32/stdio_.h  | 5 +++++
 include/lib/libc/aarch32/stdlib_.h | 5 +++++
 include/lib/libc/aarch32/string_.h | 5 +++++
 include/lib/libc/aarch32/time_.h   | 5 +++++
 include/lib/libc/aarch64/endian_.h | 6 +++---
 include/lib/libc/aarch64/stddef_.h | 5 +++++
 include/lib/libc/aarch64/stdio_.h  | 5 +++++
 include/lib/libc/aarch64/stdlib_.h | 5 +++++
 include/lib/libc/aarch64/string_.h | 5 +++++
 include/lib/libc/aarch64/time_.h   | 5 +++++
 include/lib/libc/endian.h          | 2 +-
 13 files changed, 57 insertions(+), 7 deletions(-)

(limited to 'include/lib/libc')

diff --git a/include/lib/libc/aarch32/endian_.h b/include/lib/libc/aarch32/endian_.h
index 83a26b72..0cf2c755 100644
--- a/include/lib/libc/aarch32/endian_.h
+++ b/include/lib/libc/aarch32/endian_.h
@@ -36,8 +36,8 @@
  * All rights reserved.
  */
 
-#ifndef AARCH32_ENDIAN_H
-#define AARCH32_ENDIAN_H
+#ifndef ENDIAN__H
+#define ENDIAN__H
 
 #include <stdint.h>
 
@@ -143,4 +143,4 @@ __bswap16_var(uint16_t v)
 #define __bswap32(x)	__bswap32_var(x)
 
 #endif /* __OPTIMIZE__ */
-#endif /* AARCH32_ENDIAN_H */
+#endif /* ENDIAN__H */
diff --git a/include/lib/libc/aarch32/stddef_.h b/include/lib/libc/aarch32/stddef_.h
index 928481ce..1babfade 100644
--- a/include/lib/libc/aarch32/stddef_.h
+++ b/include/lib/libc/aarch32/stddef_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDDEF__H
+#define STDDEF__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
@@ -13,3 +16,5 @@ typedef unsigned int size_t;
 typedef long ptrdiff_t;
 #define _PTRDIFF_T
 #endif
+
+#endif /* STDDEF__H */
diff --git a/include/lib/libc/aarch32/stdio_.h b/include/lib/libc/aarch32/stdio_.h
index 98304bc3..50d3cc2e 100644
--- a/include/lib/libc/aarch32/stdio_.h
+++ b/include/lib/libc/aarch32/stdio_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDIO__H
+#define STDIO__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
@@ -13,3 +16,5 @@ typedef unsigned int size_t;
 typedef int ssize_t;
 #define SSIZET_
 #endif
+
+#endif /* STDIO__H */
diff --git a/include/lib/libc/aarch32/stdlib_.h b/include/lib/libc/aarch32/stdlib_.h
index af96d016..9c07857a 100644
--- a/include/lib/libc/aarch32/stdlib_.h
+++ b/include/lib/libc/aarch32/stdlib_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDLIB__H
+#define STDLIB__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
@@ -11,3 +14,5 @@ typedef unsigned int size_t;
 
 #define EXIT_FAILURE 1
 #define EXIT_SUCCESS 0
+
+#endif /* STDLIB__H */
diff --git a/include/lib/libc/aarch32/string_.h b/include/lib/libc/aarch32/string_.h
index b3ad602f..4e139b0d 100644
--- a/include/lib/libc/aarch32/string_.h
+++ b/include/lib/libc/aarch32/string_.h
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STRING__H
+#define STRING__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
 #endif
+
+#endif /* STRING__H */
diff --git a/include/lib/libc/aarch32/time_.h b/include/lib/libc/aarch32/time_.h
index 4fc629d6..a9169c29 100644
--- a/include/lib/libc/aarch32/time_.h
+++ b/include/lib/libc/aarch32/time_.h
@@ -4,9 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef TIME__H
+#define TIME__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
 #endif
 
 typedef long int time_t;
+
+#endif /* TIME__H */
diff --git a/include/lib/libc/aarch64/endian_.h b/include/lib/libc/aarch64/endian_.h
index c60b4752..7c79fd43 100644
--- a/include/lib/libc/aarch64/endian_.h
+++ b/include/lib/libc/aarch64/endian_.h
@@ -36,8 +36,8 @@
  * All rights reserved.
  */
 
-#ifndef AARCH64_ENDIAN_H
-#define AARCH64_ENDIAN_H
+#ifndef ENDIAN__H
+#define ENDIAN__H
 
 #include <stdint.h>
 
@@ -125,4 +125,4 @@ __bswap16_var(uint16_t v)
 #define	__bswap32(x)	__bswap32_var(x)
 
 #endif /* __OPTIMIZE__ */
-#endif /* AARCH64_ENDIAN_H */
+#endif /* ENDIAN__H */
diff --git a/include/lib/libc/aarch64/stddef_.h b/include/lib/libc/aarch64/stddef_.h
index 3e5883ec..b7d8209a 100644
--- a/include/lib/libc/aarch64/stddef_.h
+++ b/include/lib/libc/aarch64/stddef_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDDEF__H
+#define STDDEF__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
@@ -13,3 +16,5 @@ typedef unsigned long size_t;
 typedef long ptrdiff_t;
 #define _PTRDIFF_T
 #endif
+
+#endif /* STDDEF__H */
diff --git a/include/lib/libc/aarch64/stdio_.h b/include/lib/libc/aarch64/stdio_.h
index ad0b2006..09b0172d 100644
--- a/include/lib/libc/aarch64/stdio_.h
+++ b/include/lib/libc/aarch64/stdio_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDIO__H
+#define STDIO__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
@@ -13,3 +16,5 @@ typedef unsigned long size_t;
 typedef long ssize_t;
 #define SSIZET_
 #endif
+
+#endif /* STDIO__H */
diff --git a/include/lib/libc/aarch64/stdlib_.h b/include/lib/libc/aarch64/stdlib_.h
index 3612c990..81a39d14 100644
--- a/include/lib/libc/aarch64/stdlib_.h
+++ b/include/lib/libc/aarch64/stdlib_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDLIB__H
+#define STDLIB__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
@@ -11,3 +14,5 @@ typedef unsigned long size_t;
 
 #define EXIT_FAILURE 1
 #define EXIT_SUCCESS 0
+
+#endif /* STDLIB__H */
diff --git a/include/lib/libc/aarch64/string_.h b/include/lib/libc/aarch64/string_.h
index a88a751a..71c51a6c 100644
--- a/include/lib/libc/aarch64/string_.h
+++ b/include/lib/libc/aarch64/string_.h
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STRING__H
+#define STRING__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
 #endif
+
+#endif /* STRING__H */
diff --git a/include/lib/libc/aarch64/time_.h b/include/lib/libc/aarch64/time_.h
index cbc34e76..68ab1b8d 100644
--- a/include/lib/libc/aarch64/time_.h
+++ b/include/lib/libc/aarch64/time_.h
@@ -4,9 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef TIME__H
+#define TIME__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
 #endif
 
 typedef long int time_t;
+
+#endif /* TIME__H */
diff --git a/include/lib/libc/endian.h b/include/lib/libc/endian.h
index 2cc4c5fc..4100f573 100644
--- a/include/lib/libc/endian.h
+++ b/include/lib/libc/endian.h
@@ -188,4 +188,4 @@ le64enc(void *pp, uint64_t u)
 	le32enc(p + 4, (uint32_t)(u >> 32));
 }
 
-#endif /* SYS_ENDIAN_H */
+#endif /* ENDIAN_H */
-- 
cgit v1.2.3