From 6d4e09ea3cdfac97d2a9cec991a8a99a55ef6ff3 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Tue, 20 May 2014 12:30:59 +0200 Subject: [PATCH] bug #35874 reserved identifier violation, 2nd part in even more files --- apps/httpserver_raw/httpd_structs.h | 6 +++--- ports/unix/include/arch/cc.h | 6 +++--- ports/unix/include/arch/perf.h | 6 +++--- ports/unix/include/arch/sys_arch.h | 6 +++--- ports/unix/include/netif/delif.h | 6 +++--- ports/unix/include/netif/dropif.h | 6 +++--- ports/unix/include/netif/list.h | 4 ++-- ports/unix/include/netif/pcapif.h | 6 +++--- ports/unix/include/netif/tapif.h | 6 +++--- ports/unix/include/netif/tcpdump.h | 6 +++--- ports/unix/include/netif/tunif.h | 6 +++--- ports/unix/include/netif/unixif.h | 6 +++--- ports/unix/proj/lib/lwipopts.h | 6 +++--- ports/unix/proj/minimal/lwipopts.h | 6 +++--- ports/unix/proj/minimal/mintapif.h | 6 +++--- ports/unix/proj/unixsim/lwipopts.h | 6 +++--- ports/win32/check/sys/time.h | 4 ++-- ports/win32/check/unistd.h | 4 ++-- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/apps/httpserver_raw/httpd_structs.h b/apps/httpserver_raw/httpd_structs.h index 4f1b3f8..cfd1e55 100644 --- a/apps/httpserver_raw/httpd_structs.h +++ b/apps/httpserver_raw/httpd_structs.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HTTPD_STRUCTS_H__ -#define LWIP_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 /* LWIP_HTTPD_STRUCTS_H__ */ +#endif /* LWIP_HTTPD_STRUCTS_H */ diff --git a/ports/unix/include/arch/cc.h b/ports/unix/include/arch/cc.h index 5640b48..84b5cd1 100644 --- a/ports/unix/include/arch/cc.h +++ b/ports/unix/include/arch/cc.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_ARCH_CC_H__ -#define LWIP_ARCH_CC_H__ +#ifndef LWIP_ARCH_CC_H +#define LWIP_ARCH_CC_H /* Include some files for defining library routines */ #include @@ -91,4 +91,4 @@ typedef unsigned long mem_ptr_t; #define LWIP_RAND() ((u32_t)rand()) -#endif /* LWIP_ARCH_CC_H__ */ +#endif /* LWIP_ARCH_CC_H */ diff --git a/ports/unix/include/arch/perf.h b/ports/unix/include/arch/perf.h index e07846f..326ac9e 100644 --- a/ports/unix/include/arch/perf.h +++ b/ports/unix/include/arch/perf.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_ARCH_PERF_H__ -#define LWIP_ARCH_PERF_H__ +#ifndef LWIP_ARCH_PERF_H +#define LWIP_ARCH_PERF_H #include @@ -60,4 +60,4 @@ void perf_print_times(struct tms *start, struct tms *end, char *key); void perf_init(char *fname); -#endif /* LWIP_ARCH_PERF_H__ */ +#endif /* LWIP_ARCH_PERF_H */ diff --git a/ports/unix/include/arch/sys_arch.h b/ports/unix/include/arch/sys_arch.h index 907256f..c69e8f9 100644 --- a/ports/unix/include/arch/sys_arch.h +++ b/ports/unix/include/arch/sys_arch.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_ARCH_SYS_ARCH_H__ -#define LWIP_ARCH_SYS_ARCH_H__ +#ifndef LWIP_ARCH_SYS_ARCH_H +#define LWIP_ARCH_SYS_ARCH_H #include @@ -55,5 +55,5 @@ typedef struct sys_mbox *sys_mbox_t; struct sys_thread; typedef struct sys_thread * sys_thread_t; -#endif /* LWIP_ARCH_SYS_ARCH_H__ */ +#endif /* LWIP_ARCH_SYS_ARCH_H */ diff --git a/ports/unix/include/netif/delif.h b/ports/unix/include/netif/delif.h index 9e68e6d..6672a73 100644 --- a/ports/unix/include/netif/delif.h +++ b/ports/unix/include/netif/delif.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_DELIF_H__ -#define LWIP_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 /* LWIP_DELIF_H__ */ +#endif /* LWIP_DELIF_H */ diff --git a/ports/unix/include/netif/dropif.h b/ports/unix/include/netif/dropif.h index 9eb7099..a173b5f 100644 --- a/ports/unix/include/netif/dropif.h +++ b/ports/unix/include/netif/dropif.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_DROPIF_H__ -#define LWIP_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 /* LWIP_DROPIF_H__ */ +#endif /* LWIP_DROPIF_H */ diff --git a/ports/unix/include/netif/list.h b/ports/unix/include/netif/list.h index 1ab31bb..2c4d142 100644 --- a/ports/unix/include/netif/list.h +++ b/ports/unix/include/netif/list.h @@ -1,6 +1,6 @@ -#ifndef LWIP_LIST_H__ -#define LWIP_LIST_H__ +#ifndef LWIP_LIST_H +#define LWIP_LIST_H struct elem; diff --git a/ports/unix/include/netif/pcapif.h b/ports/unix/include/netif/pcapif.h index c886589..ef7abd5 100644 --- a/ports/unix/include/netif/pcapif.h +++ b/ports/unix/include/netif/pcapif.h @@ -29,11 +29,11 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_PCAPIF_H__ -#define LWIP_PCAPIF_H__ +#ifndef LWIP_PCAPIF_H +#define LWIP_PCAPIF_H #include "lwip/netif.h" err_t pcapif_init(struct netif *netif); -#endif /* LWIP_PCAPIF_H__ */ +#endif /* LWIP_PCAPIF_H */ diff --git a/ports/unix/include/netif/tapif.h b/ports/unix/include/netif/tapif.h index d1e8eec..4cb0a5d 100644 --- a/ports/unix/include/netif/tapif.h +++ b/ports/unix/include/netif/tapif.h @@ -29,11 +29,11 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_TAPIF_H__ -#define LWIP_TAPIF_H__ +#ifndef LWIP_TAPIF_H +#define LWIP_TAPIF_H #include "lwip/netif.h" err_t tapif_init(struct netif *netif); -#endif /* LWIP_TAPIF_H__ */ +#endif /* LWIP_TAPIF_H */ diff --git a/ports/unix/include/netif/tcpdump.h b/ports/unix/include/netif/tcpdump.h index 1ee32e4..0acd735 100644 --- a/ports/unix/include/netif/tcpdump.h +++ b/ports/unix/include/netif/tcpdump.h @@ -29,12 +29,12 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_NETIF_TCPDUMP_H__ -#define LWIP_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 /* LWIP_NETIF_TCPDUMP_H__ */ +#endif /* LWIP_NETIF_TCPDUMP_H */ diff --git a/ports/unix/include/netif/tunif.h b/ports/unix/include/netif/tunif.h index 6107ad3..b425c06 100644 --- a/ports/unix/include/netif/tunif.h +++ b/ports/unix/include/netif/tunif.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_TUNIF_H__ -#define LWIP_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 /* LWIP_TUNIF_H__ */ +#endif /* LWIP_TUNIF_H */ diff --git a/ports/unix/include/netif/unixif.h b/ports/unix/include/netif/unixif.h index eaf3d2f..10b782b 100644 --- a/ports/unix/include/netif/unixif.h +++ b/ports/unix/include/netif/unixif.h @@ -29,12 +29,12 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_UNIXIF_H__ -#define LWIP_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 /* LWIP_UNIXIF_H__ */ +#endif /* LWIP_UNIXIF_H */ diff --git a/ports/unix/proj/lib/lwipopts.h b/ports/unix/proj/lib/lwipopts.h index 91f5e2c..f39fbdb 100644 --- a/ports/unix/proj/lib/lwipopts.h +++ b/ports/unix/proj/lib/lwipopts.h @@ -35,8 +35,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_LWIPOPTS_H__ -#define LWIP_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 /* LWIP_LWIPOPTS_H__ */ +#endif /* LWIP_LWIPOPTS_H */ diff --git a/ports/unix/proj/minimal/lwipopts.h b/ports/unix/proj/minimal/lwipopts.h index cbb1b69..544d388 100644 --- a/ports/unix/proj/minimal/lwipopts.h +++ b/ports/unix/proj/minimal/lwipopts.h @@ -35,8 +35,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_LWIPOPTS_H__ -#define LWIP_LWIPOPTS_H__ +#ifndef LWIP_LWIPOPTS_H +#define LWIP_LWIPOPTS_H /* ----------------------------------------------- @@ -392,4 +392,4 @@ /* Misc */ -#endif /* LWIP_LWIPOPTS_H__ */ +#endif /* LWIP_LWIPOPTS_H */ diff --git a/ports/unix/proj/minimal/mintapif.h b/ports/unix/proj/minimal/mintapif.h index 7e1a48a..d186f83 100644 --- a/ports/unix/proj/minimal/mintapif.h +++ b/ports/unix/proj/minimal/mintapif.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_MINTAPIF_H__ -#define LWIP_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 /* LWIP_MINTAPIF_H__ */ +#endif /* LWIP_MINTAPIF_H */ diff --git a/ports/unix/proj/unixsim/lwipopts.h b/ports/unix/proj/unixsim/lwipopts.h index dfa37ca..dce211f 100644 --- a/ports/unix/proj/unixsim/lwipopts.h +++ b/ports/unix/proj/unixsim/lwipopts.h @@ -29,8 +29,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_LWIPOPTS_H__ -#define LWIP_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 /* LWIP_LWIPOPTS_H__ */ +#endif /* LWIP_LWIPOPTS_H */ diff --git a/ports/win32/check/sys/time.h b/ports/win32/check/sys/time.h index 02ccbd6..d71d827 100644 --- a/ports/win32/check/sys/time.h +++ b/ports/win32/check/sys/time.h @@ -1,5 +1,5 @@ -#ifndef LWIP_SYS__TIME_H__ -#define LWIP_SYS__TIME_H__ +#ifndef LWIP_SYS__TIME_H +#define LWIP_SYS__TIME_H #include /* time_t */ diff --git a/ports/win32/check/unistd.h b/ports/win32/check/unistd.h index b044b81..332e6e1 100644 --- a/ports/win32/check/unistd.h +++ b/ports/win32/check/unistd.h @@ -1,5 +1,5 @@ -#ifndef LWIP_UNISTD_H__ -#define LWIP_UNISTD_H__ +#ifndef LWIP_UNISTD_H +#define LWIP_UNISTD_H /* include io.h for read() and write() */ #include