From 0384de2bcf33b26e91985004850bf5543396a24a Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Thu, 19 Jan 2017 11:50:52 +0100
Subject: [PATCH] SQUASH ME: revert changes in patch files

---
 ...Rename-colliding-files-and-functions.patch | 26 +++++++++----------
 ...-Include-RIOT-Hardware-RNG-interface.patch |  2 +-
 .../patches/0001-add-RIOT-support.patch       |  6 ++---
 ...t-implementation-of-riot-s-implement.patch |  4 +--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch b/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch
index 2563ae266739f..77368fc14d8e8 100644
--- a/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch
+++ b/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch
@@ -74,7 +74,7 @@ index 2c16c2b..fc0dca5 100644
 --- a/emb6/inc/apl/rest-engine/rest-engine.h
 +++ b/emb6/inc/apl/rest-engine/rest-engine.h
 @@ -41,7 +41,7 @@
- #define REST_ENGINE_H
+ #define REST_ENGINE_H_
  
  
 -#include "clist.h"
@@ -710,8 +710,8 @@ index 0e26be8..0000000
 - *
 - */
 -
--#ifndef LIST_H
--#define LIST_H
+-#ifndef LIST_H_
+-#define LIST_H_
 -
 -#define LIST_CONCAT2(s1, s2) s1##s2
 -#define LIST_CONCAT(s1, s2) LIST_CONCAT2(s1, s2)
@@ -798,7 +798,7 @@ index 0e26be8..0000000
 -
 -void * list_item_next(void *item);
 -
--#endif /* LIST_H */
+-#endif /* LIST_H_ */
 -
 -/** @} */
 -/** @} */
@@ -879,8 +879,8 @@ index 0000000..a104f29
 + *
 + */
 +
-+#ifndef LIST_H
-+#define LIST_H
++#ifndef LIST_H_
++#define LIST_H_
 +
 +#define LIST_CONCAT2(s1, s2) s1##s2
 +#define LIST_CONCAT(s1, s2) LIST_CONCAT2(s1, s2)
@@ -967,7 +967,7 @@ index 0000000..a104f29
 +
 +void * list_item_next(void *item);
 +
-+#endif /* LIST_H */
++#endif /* LIST_H_ */
 +
 +/** @} */
 +/** @} */
@@ -1014,8 +1014,8 @@ index 0000000..e59a500
 + * \file
 + *         A brief description the file
 + */
-+#ifndef RANDOM_H
-+#define RANDOM_H
++#ifndef RANDOM_H_
++#define RANDOM_H_
 +
 +/*
 + * Initialize the pseudo-random generator.
@@ -1034,7 +1034,7 @@ index 0000000..e59a500
 +/* Since random_rand casts to unsigned short, we'll use this maxmimum */
 +#define RANDOM_RAND_MAX 65535U
 +
-+#endif /* RANDOM_H */
++#endif /* RANDOM_H_ */
 diff --git a/utils/inc/emb6_ringbuffer.h b/utils/inc/emb6_ringbuffer.h
 new file mode 100644
 index 0000000..8b29730
@@ -1245,8 +1245,8 @@ index 3bab934..0000000
 - * \file
 - *         A brief description the file
 - */
--#ifndef RANDOM_H
--#define RANDOM_H
+-#ifndef RANDOM_H_
+-#define RANDOM_H_
 -
 -/*
 - * Initialize the pseudo-random generator.
@@ -1265,7 +1265,7 @@ index 3bab934..0000000
 -/* Since random_rand casts to unsigned short, we'll use this maxmimum */
 -#define RANDOM_RAND_MAX 65535U
 -
--#endif /* RANDOM_H */
+-#endif /* RANDOM_H_ */
 diff --git a/utils/inc/ringbuffer.h b/utils/inc/ringbuffer.h
 deleted file mode 100644
 index 8b29730..0000000
diff --git a/pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch b/pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch
index 4a625956eef12..06ab4b0c4fdc5 100644
--- a/pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch
+++ b/pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch
@@ -28,7 +28,7 @@ index 1bb595a..b13fdbe 100644
  
 +#endif /* FEATURE_PERIPH_HWRNG */
 +
- #endif /* _UECC_PLATFORM_SPECIFIC_H */
+ #endif /* _UECC_PLATFORM_SPECIFIC_H_ */
 diff --git a/uECC.c b/uECC.c
 index daa144a..3691fc4 100644
 --- a/uECC.c
diff --git a/pkg/oonf_api/patches/0001-add-RIOT-support.patch b/pkg/oonf_api/patches/0001-add-RIOT-support.patch
index 2cfdb78a86887..e8ec40831b772 100644
--- a/pkg/oonf_api/patches/0001-add-RIOT-support.patch
+++ b/pkg/oonf_api/patches/0001-add-RIOT-support.patch
@@ -238,8 +238,8 @@ index 0000000..9bf6622
 + *
 + */
 +
-+#ifndef RFC5444_API_CONFIG_H
-+#define RFC5444_API_CONFIG_H
++#ifndef RFC5444_API_CONFIG_H_
++#define RFC5444_API_CONFIG_H_
 +
 +#define DISALLOW_CONSUMER_CONTEXT_DROP false
 +#define WRITER_STATE_MACHINE true
@@ -247,6 +247,6 @@ index 0000000..9bf6622
 +#define DO_ADDR_COMPRESSION true
 +#define CLEAR_ADDRESS_POSTFIX false
 +
-+#endif /* RFC5444_API_CONFIG_H */
++#endif /* RFC5444_API_CONFIG_H_ */
 --
 1.9.1
diff --git a/pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch b/pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch
index d760a26917f95..0ccd008b0de3f 100644
--- a/pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch
+++ b/pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch
@@ -556,7 +556,7 @@ index 80da6ac..b545d53 100644
 +                                      oonf_list_last_element(head, element, list_member), \
                                        element, list_member, ptr)
  
- #endif /* LIST_H */
+ #endif /* LIST_H_ */
 diff --git a/src-api/core/oonf_logging.c b/src-api/core/oonf_logging.c
 index 33db5f4..81d32d3 100644
 --- a/src-api/core/oonf_logging.c
@@ -1440,7 +1440,7 @@ index e8fb218..edaa031 100644
 +  return oonf_list_is_node_added(&sock->node);
  }
  
- #endif /* OONF_PACKET_SOCKET_H */
+ #endif /* OONF_PACKET_SOCKET_H_ */
 diff --git a/src-api/subsystems/oonf_rfc5444.c b/src-api/subsystems/oonf_rfc5444.c
 index 013ccac..94764df 100644
 --- a/src-api/subsystems/oonf_rfc5444.c