From a2fd68098ea3912a71c14eab23032ea5c1de267b Mon Sep 17 00:00:00 2001 From: sg Date: Mon, 8 Aug 2016 21:47:20 +0200 Subject: [PATCH] minor: macros should not end with underscore(s) --- src/include/lwip/ip.h | 6 +++--- src/include/lwip/ip_addr.h | 6 +++--- src/include/netif/ppp/pppol2tp.h | 6 +++--- test/unit/core/test_mem.h | 4 ++-- test/unit/core/test_pbuf.h | 4 ++-- test/unit/dhcp/test_dhcp.h | 4 ++-- test/unit/etharp/test_etharp.h | 4 ++-- test/unit/lwip_check.h | 6 +++--- test/unit/lwipopts.h | 6 +++--- test/unit/tcp/tcp_helper.h | 4 ++-- test/unit/tcp/test_tcp.h | 4 ++-- test/unit/tcp/test_tcp_oos.h | 4 ++-- test/unit/udp/test_udp.h | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/include/lwip/ip.h b/src/include/lwip/ip.h index 0138caa8..44e5fd80 100644 --- a/src/include/lwip/ip.h +++ b/src/include/lwip/ip.h @@ -34,8 +34,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_HDR_IP_H__ -#define LWIP_HDR_IP_H__ +#ifndef LWIP_HDR_IP_H +#define LWIP_HDR_IP_H #include "lwip/opt.h" @@ -322,6 +322,6 @@ err_t ip_input(struct pbuf *p, struct netif *inp); } #endif -#endif /* LWIP_HDR_IP_H__ */ +#endif /* LWIP_HDR_IP_H */ diff --git a/src/include/lwip/ip_addr.h b/src/include/lwip/ip_addr.h index d2690e8b..5523ee02 100644 --- a/src/include/lwip/ip_addr.h +++ b/src/include/lwip/ip_addr.h @@ -34,8 +34,8 @@ * Author: Adam Dunkels * */ -#ifndef LWIP_HDR_IP_ADDR_H__ -#define LWIP_HDR_IP_ADDR_H__ +#ifndef LWIP_HDR_IP_ADDR_H +#define LWIP_HDR_IP_ADDR_H #include "lwip/opt.h" #include "lwip/def.h" @@ -357,4 +357,4 @@ extern const ip_addr_t ip6_addr_any; } #endif -#endif /* LWIP_HDR_IP_ADDR_H__ */ +#endif /* LWIP_HDR_IP_ADDR_H */ diff --git a/src/include/netif/ppp/pppol2tp.h b/src/include/netif/ppp/pppol2tp.h index 93842556..f03950e6 100644 --- a/src/include/netif/ppp/pppol2tp.h +++ b/src/include/netif/ppp/pppol2tp.h @@ -34,8 +34,8 @@ #include "netif/ppp/ppp_opts.h" #if PPP_SUPPORT && PPPOL2TP_SUPPORT /* don't build if not configured for use in lwipopts.h */ -#ifndef PPPOL2TP_H_ -#define PPPOL2TP_H_ +#ifndef PPPOL2TP_H +#define PPPOL2TP_H #include "ppp.h" @@ -197,5 +197,5 @@ ppp_pcb *pppol2tp_create(struct netif *pppif, const u8_t *secret, u8_t secret_len, ppp_link_status_cb_fn link_status_cb, void *ctx_cb); -#endif /* PPPOL2TP_H_ */ +#endif /* PPPOL2TP_H */ #endif /* PPP_SUPPORT && PPPOL2TP_SUPPORT */ diff --git a/test/unit/core/test_mem.h b/test/unit/core/test_mem.h index a85bccb4..325134c3 100644 --- a/test/unit/core/test_mem.h +++ b/test/unit/core/test_mem.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TEST_MEM_H__ -#define LWIP_HDR_TEST_MEM_H__ +#ifndef LWIP_HDR_TEST_MEM_H +#define LWIP_HDR_TEST_MEM_H #include "../lwip_check.h" diff --git a/test/unit/core/test_pbuf.h b/test/unit/core/test_pbuf.h index 82531570..da7730a4 100644 --- a/test/unit/core/test_pbuf.h +++ b/test/unit/core/test_pbuf.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TEST_PBUF_H__ -#define LWIP_HDR_TEST_PBUF_H__ +#ifndef LWIP_HDR_TEST_PBUF_H +#define LWIP_HDR_TEST_PBUF_H #include "../lwip_check.h" diff --git a/test/unit/dhcp/test_dhcp.h b/test/unit/dhcp/test_dhcp.h index 480aab9b..0d88fa1b 100644 --- a/test/unit/dhcp/test_dhcp.h +++ b/test/unit/dhcp/test_dhcp.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TEST_DHCP_H__ -#define LWIP_HDR_TEST_DHCP_H__ +#ifndef LWIP_HDR_TEST_DHCP_H +#define LWIP_HDR_TEST_DHCP_H #include "../lwip_check.h" diff --git a/test/unit/etharp/test_etharp.h b/test/unit/etharp/test_etharp.h index fac7c9cf..2dd772d8 100644 --- a/test/unit/etharp/test_etharp.h +++ b/test/unit/etharp/test_etharp.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TEST_ETHARP_H__ -#define LWIP_HDR_TEST_ETHARP_H__ +#ifndef LWIP_HDR_TEST_ETHARP_H +#define LWIP_HDR_TEST_ETHARP_H #include "../lwip_check.h" diff --git a/test/unit/lwip_check.h b/test/unit/lwip_check.h index 2126e2ff..0c218d1d 100644 --- a/test/unit/lwip_check.h +++ b/test/unit/lwip_check.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_LWIP_CHECK_H__ -#define LWIP_HDR_LWIP_CHECK_H__ +#ifndef LWIP_HDR_LWIP_CHECK_H +#define LWIP_HDR_LWIP_CHECK_H /* Common header file for lwIP unit tests using the check framework */ @@ -34,4 +34,4 @@ Suite* create_suite(const char* name, testfunc *tests, size_t num_tests, SFun se int lwip_unittests_run(void) #endif -#endif /* LWIP_HDR_LWIP_CHECK_H__ */ +#endif /* LWIP_HDR_LWIP_CHECK_H */ diff --git a/test/unit/lwipopts.h b/test/unit/lwipopts.h index 5cda4315..516a8493 100644 --- a/test/unit/lwipopts.h +++ b/test/unit/lwipopts.h @@ -29,8 +29,8 @@ * Author: Simon Goldschmidt * */ -#ifndef LWIP_HDR_LWIPOPTS_H__ -#define LWIP_HDR_LWIPOPTS_H__ +#ifndef LWIP_HDR_LWIPOPTS_H +#define LWIP_HDR_LWIPOPTS_H /* Prevent having to link sys_arch.c (we don't test the API layers in unit tests) */ #define NO_SYS 1 @@ -54,4 +54,4 @@ /* Minimal changes to opt.h required for etharp unit tests: */ #define ETHARP_SUPPORT_STATIC_ENTRIES 1 -#endif /* LWIP_HDR_LWIPOPTS_H__ */ +#endif /* LWIP_HDR_LWIPOPTS_H */ diff --git a/test/unit/tcp/tcp_helper.h b/test/unit/tcp/tcp_helper.h index 4119f37e..04974818 100644 --- a/test/unit/tcp/tcp_helper.h +++ b/test/unit/tcp/tcp_helper.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TCP_HELPER_H__ -#define LWIP_HDR_TCP_HELPER_H__ +#ifndef LWIP_HDR_TCP_HELPER_H +#define LWIP_HDR_TCP_HELPER_H #include "../lwip_check.h" #include "lwip/arch.h" diff --git a/test/unit/tcp/test_tcp.h b/test/unit/tcp/test_tcp.h index ea739eba..f28ee565 100644 --- a/test/unit/tcp/test_tcp.h +++ b/test/unit/tcp/test_tcp.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TEST_TCP_H__ -#define LWIP_HDR_TEST_TCP_H__ +#ifndef LWIP_HDR_TEST_TCP_H +#define LWIP_HDR_TEST_TCP_H #include "../lwip_check.h" diff --git a/test/unit/tcp/test_tcp_oos.h b/test/unit/tcp/test_tcp_oos.h index 1cb8650f..5b82013b 100644 --- a/test/unit/tcp/test_tcp_oos.h +++ b/test/unit/tcp/test_tcp_oos.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TEST_TCP_OOS_H__ -#define LWIP_HDR_TEST_TCP_OOS_H__ +#ifndef LWIP_HDR_TEST_TCP_OOS_H +#define LWIP_HDR_TEST_TCP_OOS_H #include "../lwip_check.h" diff --git a/test/unit/udp/test_udp.h b/test/unit/udp/test_udp.h index eb14354b..5426bf42 100644 --- a/test/unit/udp/test_udp.h +++ b/test/unit/udp/test_udp.h @@ -1,5 +1,5 @@ -#ifndef LWIP_HDR_TEST_UDP_H__ -#define LWIP_HDR_TEST_UDP_H__ +#ifndef LWIP_HDR_TEST_UDP_H +#define LWIP_HDR_TEST_UDP_H #include "../lwip_check.h"