From 54f7cae12c1db25e64daec6980ffadbaa7bd94e8 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Thu, 21 Apr 2016 23:15:49 +0200
Subject: [PATCH] PPP, fix reserved identifier violation (removed leading
 underscores from header include guards)

---
 src/include/netif/ppp/chap_ms.h  | 6 +++---
 src/include/netif/ppp/eui64.h    | 6 +++---
 src/include/netif/ppp/ppp_opts.h | 6 +++---
 src/include/netif/ppp/pppapi.h   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/include/netif/ppp/chap_ms.h b/src/include/netif/ppp/chap_ms.h
index 7fc87d9b..07952911 100644
--- a/src/include/netif/ppp/chap_ms.h
+++ b/src/include/netif/ppp/chap_ms.h
@@ -33,12 +33,12 @@
 #include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && MSCHAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
 
-#ifndef __CHAPMS_INCLUDE__
+#ifndef CHAPMS_INCLUDE
+#define CHAPMS_INCLUDE
 
 extern const struct chap_digest_type chapms_digest;
 extern const struct chap_digest_type chapms2_digest;
 
-#define __CHAPMS_INCLUDE__
-#endif /* __CHAPMS_INCLUDE__ */
+#endif /* CHAPMS_INCLUDE */
 
 #endif /* PPP_SUPPORT && MSCHAP_SUPPORT */
diff --git a/src/include/netif/ppp/eui64.h b/src/include/netif/ppp/eui64.h
index 157e53e0..7938cb3a 100644
--- a/src/include/netif/ppp/eui64.h
+++ b/src/include/netif/ppp/eui64.h
@@ -38,8 +38,8 @@
 #include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PPP_IPV6_SUPPORT  /* don't build if not configured for use in lwipopts.h */
 
-#ifndef __EUI64_H__
-#define __EUI64_H__
+#ifndef EUI64_H
+#define EUI64_H
 
 /*
  * TODO:
@@ -90,5 +90,5 @@ typedef union
 
 char *eui64_ntoa(eui64_t);	/* Returns ascii representation of id */
 
-#endif /* __EUI64_H__ */
+#endif /* EUI64_H */
 #endif /* PPP_SUPPORT && PPP_IPV6_SUPPORT */
diff --git a/src/include/netif/ppp/ppp_opts.h b/src/include/netif/ppp/ppp_opts.h
index 07e5cb4a..95ac2b3f 100644
--- a/src/include/netif/ppp/ppp_opts.h
+++ b/src/include/netif/ppp/ppp_opts.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef __LWIP_PPP_OPTS_H__
-#define __LWIP_PPP_OPTS_H__
+#ifndef LWIP_PPP_OPTS_H
+#define LWIP_PPP_OPTS_H
 
 #include "lwip/opt.h"
 
@@ -537,4 +537,4 @@
 
 #endif /* PPP_SUPPORT */
 
-#endif /* __LWIP_PPP_OPTS_H__ */
+#endif /* LWIP_PPP_OPTS_H */
diff --git a/src/include/netif/ppp/pppapi.h b/src/include/netif/ppp/pppapi.h
index 4858e2e1..6a205fb8 100644
--- a/src/include/netif/ppp/pppapi.h
+++ b/src/include/netif/ppp/pppapi.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef __LWIP_PPPAPI_H__
-#define __LWIP_PPPAPI_H__
+#ifndef LWIP_PPPAPI_H
+#define LWIP_PPPAPI_H
 
 #include "netif/ppp/ppp_opts.h"
 
@@ -145,4 +145,4 @@ err_t pppapi_ioctl(ppp_pcb *pcb, u8_t cmd, void *arg);
 
 #endif /* LWIP_PPP_API */
 
-#endif /* __LWIP_PPPAPI_H__ */
+#endif /* LWIP_PPPAPI_H */