Fixed bug #35874 reserved identifier violation (removed leading underscores from header include guards)

2014-05-19 21:58:36 +02:00 · 2014-05-19 21:58:36 +02:00 · b833b173cc
parent 1e04deb667
commit b833b173cc
42 changed files with 121 additions and 121 deletions
--- a/apps/chargen/chargen.h
+++ b/apps/chargen/chargen.h
@ -1,5 +1,5 @@
-#ifndef __CHARGEN_H__
-#define __CHARGEN_H__
+#ifndef LWIP_CHARGEN_H__
+#define LWIP_CHARGEN_H__

 #include "lwip/opt.h"

@ -10,4 +10,4 @@ void chargen_init(void);
 #endif /* LWIP_SOCKET */


-#endif /* __CHARGEN_H__ */
+#endif /* LWIP_CHARGEN_H__ */
--- a/apps/httpserver/httpserver-netconn.h
+++ b/apps/httpserver/httpserver-netconn.h
@ -1,6 +1,6 @@
-#ifndef __HTTPSERVER_NETCONN_H__
-#define __HTTPSERVER_NETCONN_H__
+#ifndef LWIP_HTTPSERVER_NETCONN_H__
+#define LWIP_HTTPSERVER_NETCONN_H__

 void http_server_netconn_init();

-#endif /* __HTTPSERVER_NETCONN_H__ */
+#endif /* LWIP_HTTPSERVER_NETCONN_H__ */
--- a/apps/httpserver_raw/fs.h
+++ b/apps/httpserver_raw/fs.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __FS_H__
-#define __FS_H__
+#ifndef LWIP_FS_H__
+#define LWIP_FS_H__

 #include "lwip/opt.h"
 #include "lwip/err.h"
@ -129,4 +129,4 @@ void *fs_state_init(struct fs_file *file, const char *name);
 void fs_state_free(struct fs_file *file, void *state);
 #endif /* #if LWIP_HTTPD_FILE_STATE */

-#endif /* __FS_H__ */
+#endif /* LWIP_FS_H__ */
--- a/apps/httpserver_raw/fsdata.h
+++ b/apps/httpserver_raw/fsdata.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __FSDATA_H__
-#define __FSDATA_H__
+#ifndef LWIP_FSDATA_H__
+#define LWIP_FSDATA_H__

 #include "lwip/opt.h"
 #include "fs.h"
@ -47,4 +47,4 @@ struct fsdata_file {
 #endif /* HTTPD_PRECALCULATED_CHECKSUM */
 };

-#endif /* __FSDATA_H__ */
+#endif /* LWIP_FSDATA_H__ */
--- a/apps/httpserver_raw/httpd.h
+++ b/apps/httpserver_raw/httpd.h
@ -33,8 +33,8 @@
 * capability.
 */

-#ifndef __HTTPD_H__
-#define __HTTPD_H__
+#ifndef LWIP_HTTPD_H__
+#define LWIP_HTTPD_H__

 #include "lwip/opt.h"
 #include "lwip/err.h"
@ -233,4 +233,4 @@ void httpd_post_data_recved(void *connection, u16_t recved_len);

 void httpd_init(void);

-#endif /* __HTTPD_H__ */
+#endif /* LWIP_HTTPD_H__ */
--- a/apps/httpserver_raw/httpd_structs.h
+++ b/apps/httpserver_raw/httpd_structs.h
@ -1,5 +1,5 @@
-#ifndef __HTTPD_STRUCTS_H__
-#define __HTTPD_STRUCTS_H__
+#ifndef LWIP_HTTPD_STRUCTS_H__
+#define LWIP_HTTPD_STRUCTS_H__

 #include "httpd.h"

@ -122,4 +122,4 @@ static const char * const g_pcSSIExtensions[] = {
 #define NUM_SHTML_EXTENSIONS (sizeof(g_pcSSIExtensions) / sizeof(const char *))
 #endif /* LWIP_HTTPD_SSI */

-#endif /* __HTTPD_STRUCTS_H__ */
+#endif /* LWIP_HTTPD_STRUCTS_H__ */
--- a/apps/netbios/netbios.h
+++ b/apps/netbios/netbios.h
@ -1,6 +1,6 @@
-#ifndef __NETBIOS_H__
-#define __NETBIOS_H__
+#ifndef LWIP_NETBIOS_H__
+#define LWIP_NETBIOS_H__

 void netbios_init(void);

-#endif /* __NETBIOS_H__ */
+#endif /* LWIP_NETBIOS_H__ */
--- a/apps/netio/netio.h
+++ b/apps/netio/netio.h
@ -1,6 +1,6 @@
-#ifndef __NETIO_H__
-#define __NETIO_H__
+#ifndef LWIP_NETIO_H__
+#define LWIP_NETIO_H__

 void netio_init(void);

-#endif /* __NETIO_H__ */
+#endif /* LWIP_NETIO_H__ */
--- a/apps/ping/ping.h
+++ b/apps/ping/ping.h
@ -1,5 +1,5 @@
-#ifndef __PING_H__
-#define __PING_H__
+#ifndef LWIP_PING_H__
+#define LWIP_PING_H__

 /**
 * PING_USE_SOCKETS: Set to 1 to use sockets, otherwise the raw api is used
@ -15,4 +15,4 @@ void ping_init(void);
 void ping_send_now(void);
 #endif /* !PING_USE_SOCKETS */

-#endif /* __PING_H__ */
+#endif /* LWIP_PING_H__ */
--- a/apps/rtp/rtp.h
+++ b/apps/rtp/rtp.h
@ -1,8 +1,8 @@
-#ifndef __RTP_H__
-#define __RTP_H__
+#ifndef LWIP_RTP_H__
+#define LWIP_RTP_H__

 #if LWIP_SOCKET && LWIP_IGMP
 void rtp_init(void);
 #endif /* LWIP_SOCKET && LWIP_IGMP */

-#endif /* __RTP_H__ */
+#endif /* LWIP_RTP_H__ */
--- a/apps/shell/shell.h
+++ b/apps/shell/shell.h
@ -29,9 +29,9 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __SHELL_H__
-#define __SHELL_H__
+#ifndef LWIP_SHELL_H__
+#define LWIP_SHELL_H__

 void shell_init(void);

-#endif /* __SHELL_H__ */
+#endif /* LWIP_SHELL_H__ */
--- a/apps/smtp/smtp.h
+++ b/apps/smtp/smtp.h
@ -1,5 +1,5 @@
-#ifndef __SMTP_H__
-#define __SMTP_H__
+#ifndef LWIP_SMTP_H__
+#define LWIP_SMTP_H__

 #include "lwip/err.h"

@ -64,4 +64,4 @@ void smtp_send_mail_int(void *arg);
 const char* smtp_result_str(u8_t smtp_result);
 #endif

-#endif /* __SMTP_H__ */
+#endif /* LWIP_SMTP_H__ */
--- a/apps/snmp_private_mib/private_mib.h
+++ b/apps/snmp_private_mib/private_mib.h
@ -3,8 +3,8 @@
 * Exports Private lwIP MIB 
 */

-#ifndef __LWIP_PRIVATE_MIB_H__
-#define __LWIP_PRIVATE_MIB_H__
+#ifndef LWIP_HDR_PRIVATE_MIB_H__
+#define LWIP_HDR_PRIVATE_MIB_H__

 #include "arch/cc.h"
 #include "lwip/opt.h"
--- a/apps/sntp/sntp.h
+++ b/apps/sntp/sntp.h
@ -1,5 +1,5 @@
-#ifndef __SNTP_H__
-#define __SNTP_H__
+#ifndef LWIP_SNTP_H__
+#define LWIP_SNTP_H__

 #ifdef __cplusplus
 extern "C" {
@ -12,4 +12,4 @@ void sntp_stop(void);
 }
 #endif

-#endif /* __SNTP_H__ */
+#endif /* LWIP_SNTP_H__ */
--- a/apps/socket_examples/socket_examples.h
+++ b/apps/socket_examples/socket_examples.h
@ -1,6 +1,6 @@
-#ifndef __SOCKET_EXAMPLES_H__
-#define __SOCKET_EXAMPLES_H__
+#ifndef LWIP_SOCKET_EXAMPLES_H__
+#define LWIP_SOCKET_EXAMPLES_H__

 void socket_examples_init(void);

-#endif /* __SOCKET_EXAMPLES_H__ */
+#endif /* LWIP_SOCKET_EXAMPLES_H__ */
--- a/apps/tcpecho/tcpecho.h
+++ b/apps/tcpecho/tcpecho.h
@ -30,9 +30,9 @@
 *
 */

-#ifndef __TCPECHO_H__
-#define __TCPECHO_H__
+#ifndef LWIP_TCPECHO_H__
+#define LWIP_TCPECHO_H__

 void tcpecho_init(void);

-#endif /* __TCPECHO_H__ */
+#endif /* LWIP_TCPECHO_H__ */
--- a/apps/tcpecho_raw/echo.h
+++ b/apps/tcpecho_raw/echo.h
@ -27,9 +27,9 @@
 * This file is part of the lwIP TCP/IP stack.
 * 
 */
-#ifndef __ECHO_H__
-#define __ECHO_H__
+#ifndef LWIP_ECHO_H__
+#define LWIP_ECHO_H__

 void echo_init(void);

-#endif /* __MINIMAL_ECHO_H */
+#endif /* LWIP_ECHO_H */
--- a/apps/udpecho/udpecho.h
+++ b/apps/udpecho/udpecho.h
@ -29,9 +29,9 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __UDPECHO_H__
-#define __UDPECHO_H__
+#ifndef LWIP_UDPECHO_H__
+#define LWIP_UDPECHO_H__

 void udpecho_init(void);

-#endif /* __UDPECHO_H__ */
+#endif /* LWIP_UDPECHO_H__ */
--- a/ports/unix/include/arch/cc.h
+++ b/ports/unix/include/arch/cc.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __ARCH_CC_H__
-#define __ARCH_CC_H__
+#ifndef LWIP_ARCH_CC_H__
+#define LWIP_ARCH_CC_H__

 /* Include some files for defining library routines */
 #include <string.h>
@ -91,4 +91,4 @@ typedef unsigned long mem_ptr_t;

 #define LWIP_RAND() ((u32_t)rand())

-#endif /* __ARCH_CC_H__ */
+#endif /* LWIP_ARCH_CC_H__ */
--- a/ports/unix/include/arch/perf.h
+++ b/ports/unix/include/arch/perf.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __ARCH_PERF_H__
-#define __ARCH_PERF_H__
+#ifndef LWIP_ARCH_PERF_H__
+#define LWIP_ARCH_PERF_H__

 #include <sys/times.h>

@ -60,4 +60,4 @@ void perf_print_times(struct tms *start, struct tms *end, char *key);

 void perf_init(char *fname);

-#endif /* __ARCH_PERF_H__ */
+#endif /* LWIP_ARCH_PERF_H__ */
--- a/ports/unix/include/arch/sys_arch.h
+++ b/ports/unix/include/arch/sys_arch.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __ARCH_SYS_ARCH_H__
-#define __ARCH_SYS_ARCH_H__
+#ifndef LWIP_ARCH_SYS_ARCH_H__
+#define LWIP_ARCH_SYS_ARCH_H__

 #include <errno.h>

@ -55,5 +55,5 @@ typedef struct sys_mbox *sys_mbox_t;
 struct sys_thread;
 typedef struct sys_thread * sys_thread_t;

-#endif /* __ARCH_SYS_ARCH_H__ */
+#endif /* LWIP_ARCH_SYS_ARCH_H__ */

--- a/ports/unix/include/netif/delif.h
+++ b/ports/unix/include/netif/delif.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __DELIF_H__
-#define __DELIF_H__
+#ifndef LWIP_DELIF_H__
+#define LWIP_DELIF_H__

 #include "lwip/netif.h"

@ -39,4 +39,4 @@
 err_t delif_init(struct netif *netif);
 err_t delif_init_thread(struct netif *netif);

-#endif /* __DELIF_H__ */
+#endif /* LWIP_DELIF_H__ */
--- a/ports/unix/include/netif/dropif.h
+++ b/ports/unix/include/netif/dropif.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __DROPIF_H__
-#define __DROPIF_H__
+#ifndef LWIP_DROPIF_H__
+#define LWIP_DROPIF_H__

 #include "lwip/netif.h"

@ -38,4 +38,4 @@

 err_t dropif_init(struct netif *netif);

-#endif /* __DROPIF_H__ */
+#endif /* LWIP_DROPIF_H__ */
--- a/ports/unix/include/netif/list.h
+++ b/ports/unix/include/netif/list.h
@ -1,6 +1,6 @@

-#ifndef __LIST_H__
-#define __LIST_H__
+#ifndef LWIP_LIST_H__
+#define LWIP_LIST_H__

 struct elem;

--- a/ports/unix/include/netif/pcapif.h
+++ b/ports/unix/include/netif/pcapif.h
@ -29,11 +29,11 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __PCAPIF_H__
-#define __PCAPIF_H__
+#ifndef LWIP_PCAPIF_H__
+#define LWIP_PCAPIF_H__

 #include "lwip/netif.h"

 err_t pcapif_init(struct netif *netif);

-#endif /* __PCAPIF_H__ */
+#endif /* LWIP_PCAPIF_H__ */
--- a/ports/unix/include/netif/tapif.h
+++ b/ports/unix/include/netif/tapif.h
@ -29,11 +29,11 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __TAPIF_H__
-#define __TAPIF_H__
+#ifndef LWIP_TAPIF_H__
+#define LWIP_TAPIF_H__

 #include "lwip/netif.h"

 err_t tapif_init(struct netif *netif);

-#endif /* __TAPIF_H__ */
+#endif /* LWIP_TAPIF_H__ */
--- a/ports/unix/include/netif/tcpdump.h
+++ b/ports/unix/include/netif/tcpdump.h
@ -29,12 +29,12 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __NETIF_TCPDUMP_H__
-#define __NETIF_TCPDUMP_H__
+#ifndef LWIP_NETIF_TCPDUMP_H__
+#define LWIP_NETIF_TCPDUMP_H__

 #include "lwip/pbuf.h"

 void tcpdump_init(void);
 void tcpdump(struct pbuf *p);

-#endif /* __NETIF_TCPDUMP_H__ */
+#endif /* LWIP_NETIF_TCPDUMP_H__ */
--- a/ports/unix/include/netif/tunif.h
+++ b/ports/unix/include/netif/tunif.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __TUNIF_H__
-#define __TUNIF_H__
+#ifndef LWIP_TUNIF_H__
+#define LWIP_TUNIF_H__

 #include "lwip/netif.h"

@ -38,4 +38,4 @@

 err_t tunif_init(struct netif *netif);

-#endif /* __TUNIF_H__ */
+#endif /* LWIP_TUNIF_H__ */
--- a/ports/unix/include/netif/unixif.h
+++ b/ports/unix/include/netif/unixif.h
@ -29,12 +29,12 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __UNIXIF_H__
-#define __UNIXIF_H__
+#ifndef LWIP_UNIXIF_H__
+#define LWIP_UNIXIF_H__

 #include "lwip/netif.h"

 err_t unixif_init_server(struct netif *netif);
 err_t unixif_init_client(struct netif *netif);

-#endif /* __UNIXIF_H__ */
+#endif /* LWIP_UNIXIF_H__ */
--- a/ports/unix/proj/lib/lwipopts.h
+++ b/ports/unix/proj/lib/lwipopts.h
@ -35,8 +35,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
+#ifndef LWIP_LWIPOPTS_H__
+#define LWIP_LWIPOPTS_H__

 /*
 * Include user defined options first. Anything not defined in these files
@ -416,4 +416,4 @@

 /* Misc */

-#endif /* __LWIPOPTS_H__ */
+#endif /* LWIP_LWIPOPTS_H__ */
--- a/ports/unix/proj/minimal/lwipopts.h
+++ b/ports/unix/proj/minimal/lwipopts.h
@ -35,8 +35,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
+#ifndef LWIP_LWIPOPTS_H__
+#define LWIP_LWIPOPTS_H__

 /*
   -----------------------------------------------
@ -392,4 +392,4 @@

 /* Misc */

-#endif /* __LWIPOPTS_H__ */
+#endif /* LWIP_LWIPOPTS_H__ */
--- a/ports/unix/proj/minimal/mintapif.h
+++ b/ports/unix/proj/minimal/mintapif.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __MINTAPIF_H__
-#define __MINTAPIF_H__
+#ifndef LWIP_MINTAPIF_H__
+#define LWIP_MINTAPIF_H__

 #include "lwip/netif.h"

@ -43,4 +43,4 @@ err_t mintapif_init(struct netif *netif);
 int mintapif_select(struct netif *netif);
 enum mintapif_signal mintapif_wait(struct netif *netif, u16_t time);

-#endif /* __MINTAPIF_H__ */
+#endif /* LWIP_MINTAPIF_H__ */
--- a/ports/unix/proj/minimal/timer.h
+++ b/ports/unix/proj/minimal/timer.h
@ -1,5 +1,5 @@
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef LWIP_TIMER_H_
+#define LWIP_TIMER_H_

 #define TIMER_EVT_ETHARPTMR 0
 #define TIMER_EVT_TCPTMR 1
--- a/ports/unix/proj/unixsim/lwipopts.h
+++ b/ports/unix/proj/unixsim/lwipopts.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
+#ifndef LWIP_LWIPOPTS_H__
+#define LWIP_LWIPOPTS_H__

 #define LWIP_DBG_MIN_LEVEL 0
 #define LWIP_COMPAT_SOCKETS 1
@ -308,4 +308,4 @@ a lot of data that needs to be copied, this should be set high. */

 #endif /* PPP_SUPPORT > 0 */

-#endif /* __LWIPOPTS_H__ */
+#endif /* LWIP_LWIPOPTS_H__ */
--- a/ports/win32/check/sys/time.h
+++ b/ports/win32/check/sys/time.h
@ -1,5 +1,5 @@
-#ifndef __SYS__TIME_H__
-#define __SYS__TIME_H__
+#ifndef LWIP_SYS__TIME_H__
+#define LWIP_SYS__TIME_H__

 #include <stdlib.h> /* time_t */

--- a/ports/win32/check/unistd.h
+++ b/ports/win32/check/unistd.h
@ -1,5 +1,5 @@
-#ifndef __UNISTD_H__
-#define __UNISTD_H__
+#ifndef LWIP_UNISTD_H__
+#define LWIP_UNISTD_H__

 /* include io.h for read() and write() */
 #include <io.h>
--- a/ports/win32/include/arch/cc.h
+++ b/ports/win32/include/arch/cc.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __ARCH_CC_H__
-#define __ARCH_CC_H__
+#ifndef LWIP_ARCH_CC_H__
+#define LWIP_ARCH_CC_H__

 #include <stdio.h> /* printf, fflush, FILE */
 #include <stdlib.h> /* abort */
@ -101,4 +101,4 @@ u32_t dns_lookup_external_hosts_file(const char *name);

 #define LWIP_RAND() ((u32_t)rand())

-#endif /* __ARCH_CC_H__ */
+#endif /* LWIP_ARCH_CC_H__ */
--- a/ports/win32/include/arch/perf.h
+++ b/ports/win32/include/arch/perf.h
@ -31,10 +31,10 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __PERF_H__
-#define __PERF_H__
+#ifndef LWIP_PERF_H__
+#define LWIP_PERF_H__

 #define PERF_START    /* null definition */
 #define PERF_STOP(x)  /* null definition */

-#endif /* __PERF_H__ */
+#endif /* LWIP_PERF_H__ */
--- a/ports/win32/include/arch/sys_arch.h
+++ b/ports/win32/include/arch/sys_arch.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __ARCH_SYS_ARCH_H__
-#define __ARCH_SYS_ARCH_H__
+#ifndef LWIP_ARCH_SYS_ARCH_H__
+#define LWIP_ARCH_SYS_ARCH_H__

 /* HANDLE is used for sys_sem_t but we won't include windows.h */
 struct _sys_sem {
@ -60,5 +60,5 @@ typedef struct lwip_mbox sys_mbox_t;
 /* DWORD (thread id) is used for sys_thread_t but we won't include windows.h */
 typedef u32_t sys_thread_t;

-#endif /* __ARCH_SYS_ARCH_H__ */
+#endif /* LWIP_ARCH_SYS_ARCH_H__ */

--- a/ports/win32/include/lwipopts.h
+++ b/ports/win32/include/lwipopts.h
@ -29,8 +29,8 @@
 * Author: Adam Dunkels <adam@sics.se>
 *
 */
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
+#ifndef LWIP_LWIPOPTS_H__
+#define LWIP_LWIPOPTS_H__

 #define NO_SYS                     0
 #define LWIP_SOCKET               (NO_SYS==0)
@ -282,4 +282,4 @@ a lot of data that needs to be copied, this should be set high. */

 #endif /* PPP_SUPPORT */

-#endif /* __LWIPOPTS_H__ */
+#endif /* LWIP_LWIPOPTS_H__ */
--- a/ports/win32/pcapif.h
+++ b/ports/win32/pcapif.h
@ -1,5 +1,5 @@
-#ifndef __PCAPIF_H__
-#define __PCAPIF_H__
+#ifndef LWIP_PCAPIF_H__
+#define LWIP_PCAPIF_H__

 #ifdef __cplusplus
 extern "C" {
@ -29,4 +29,4 @@ void  pcapif_poll    (struct netif *netif);
 }
 #endif

-#endif /* __PCAPIF_H__ */
+#endif /* LWIP_PCAPIF_H__ */
--- a/ports/win32/pcapif_helper.h
+++ b/ports/win32/pcapif_helper.h
@ -1,5 +1,5 @@
-#ifndef __PCAPIF_HELPER_H__
-#define __PCAPIF_HELPER_H__
+#ifndef LWIP_PCAPIF_HELPER_H__
+#define LWIP_PCAPIF_HELPER_H__

 #ifdef __cplusplus
 extern "C" {
@ -22,4 +22,4 @@ void pcapifh_linkstate_close(struct pcapifh_linkstate* state);
 }
 #endif

-#endif /* __PCAPIF_HELPER_H__ */
+#endif /* LWIP_PCAPIF_HELPER_H__ */