mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
Update header include guard naming of all apps headers
Unbreak compilation, lwip/apps/snmp.h guard clashed with lwip/snmp.h
This commit is contained in:
parent
65bb7a623c
commit
3f49b85680
@ -130,7 +130,7 @@ SNMPFILES=$(LWIPDIR)/apps/snmp/asn1_dec.c \
|
||||
HTTPDFILES=$(LWIPDIR)/apps/httpd/fs.c \
|
||||
$(LWIPDIR)/apps/httpd/httpd.c
|
||||
|
||||
# LWIPERFFILES: IPERF client
|
||||
# LWIPERFFILES: IPERF server
|
||||
LWIPERFFILES=$(LWIPDIR)/apps/lwiperf/lwiperf.c
|
||||
|
||||
# SNTPFILES: SNTP client
|
||||
|
@ -29,8 +29,8 @@
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_FS_H
|
||||
#define LWIP_FS_H
|
||||
#ifndef LWIP_HDR_APPS_FS_H
|
||||
#define LWIP_HDR_APPS_FS_H
|
||||
|
||||
#include "httpd_opts.h"
|
||||
#include "lwip/err.h"
|
||||
@ -97,4 +97,4 @@ void fs_state_free(struct fs_file *file, void *state);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_FS_H */
|
||||
#endif /* LWIP_HDR_APPS_FS_H */
|
||||
|
@ -33,8 +33,8 @@
|
||||
* capability.
|
||||
*/
|
||||
|
||||
#ifndef LWIP_HTTPD_H
|
||||
#define LWIP_HTTPD_H
|
||||
#ifndef LWIP_HDR_APPS_HTTPD_H
|
||||
#define LWIP_HDR_APPS_HTTPD_H
|
||||
|
||||
#include "httpd_opts.h"
|
||||
#include "lwip/err.h"
|
||||
@ -196,4 +196,4 @@ void httpd_init(void);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HTTPD_H */
|
||||
#endif /* LWIP_HDR_APPS_HTTPD_H */
|
||||
|
@ -33,8 +33,8 @@
|
||||
* capability.
|
||||
*/
|
||||
|
||||
#ifndef LWIP_HTTPD_OPTS_H
|
||||
#define LWIP_HTTPD_OPTS_H
|
||||
#ifndef LWIP_HDR_APPS_HTTPD_OPTS_H
|
||||
#define LWIP_HDR_APPS_HTTPD_OPTS_H
|
||||
|
||||
#include "lwip/opt.h"
|
||||
|
||||
@ -283,4 +283,4 @@
|
||||
#define HTTPD_USE_CUSTOM_FSDATA 0
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HTTPD_OPTS_H */
|
||||
#endif /* LWIP_HDR_APPS_HTTPD_OPTS_H */
|
||||
|
@ -29,8 +29,8 @@
|
||||
* Author: Simon Goldschmidt
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_HDR_LWIPERF_H
|
||||
#define LWIP_HDR_LWIPERF_H
|
||||
#ifndef LWIP_HDR_APPS_LWIPERF_H
|
||||
#define LWIP_HDR_APPS_LWIPERF_H
|
||||
|
||||
#include "lwip/opt.h"
|
||||
#include "lwip/ip_addr.h"
|
||||
@ -73,4 +73,4 @@ void lwiperf_abort(void* lwiperf_session);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HDR_LWIPERF_H */
|
||||
#endif /* LWIP_HDR_APPS_LWIPERF_H */
|
||||
|
@ -24,8 +24,8 @@
|
||||
* This file is part of the lwIP TCP/IP stack.
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_HDR_NETBIOS_H
|
||||
#define LWIP_HDR_NETBIOS_H
|
||||
#ifndef LWIP_HDR_APPS_NETBIOS_H
|
||||
#define LWIP_HDR_APPS_NETBIOS_H
|
||||
|
||||
#include "lwip/apps/netbiosns_opts.h"
|
||||
|
||||
@ -36,4 +36,4 @@ void netbiosns_set_name(const char* hostname);
|
||||
#endif
|
||||
void netbiosns_stop(void);
|
||||
|
||||
#endif /* LWIP_HDR_NETBIOS_H */
|
||||
#endif /* LWIP_HDR_APPS_NETBIOS_H */
|
||||
|
@ -24,8 +24,8 @@
|
||||
* This file is part of the lwIP TCP/IP stack.
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_HDR_NETBIOS_OPTS_H
|
||||
#define LWIP_HDR_NETBIOS_OPTS_H
|
||||
#ifndef LWIP_HDR_APPS_NETBIOS_OPTS_H
|
||||
#define LWIP_HDR_APPS_NETBIOS_OPTS_H
|
||||
|
||||
#include "lwip/opt.h"
|
||||
|
||||
@ -50,4 +50,4 @@
|
||||
/*#define NETBIOS_LWIP_NAME "NETBIOSLWIPDEV"*/
|
||||
|
||||
|
||||
#endif /* LWIP_HDR_NETBIOS_OPTS_H */
|
||||
#endif /* LWIP_HDR_APPS_NETBIOS_OPTS_H */
|
||||
|
@ -30,8 +30,8 @@
|
||||
* Author: Leon Woestenberg <leon.woestenberg@axon.tv>
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_HDR_SNMP_H
|
||||
#define LWIP_HDR_SNMP_H
|
||||
#ifndef LWIP_HDR_APPS_SNMP_H
|
||||
#define LWIP_HDR_APPS_SNMP_H
|
||||
|
||||
#include "lwip/apps/snmp_opts.h"
|
||||
|
||||
@ -96,4 +96,4 @@ void snmp_authfail_trap(void);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HDR_SNMP_H */
|
||||
#endif /* LWIP_HDR_APPS_SNMP_H */
|
||||
|
@ -32,8 +32,8 @@
|
||||
* Author: Christiaan Simons <christiaan.simons@axon.tv>
|
||||
*/
|
||||
|
||||
#ifndef LWIP_HDR_SNMP_ASN1_H
|
||||
#define LWIP_HDR_SNMP_ASN1_H
|
||||
#ifndef LWIP_HDR_APPS_SNMP_ASN1_H
|
||||
#define LWIP_HDR_APPS_SNMP_ASN1_H
|
||||
|
||||
#include "lwip/apps/snmp_opts.h"
|
||||
#include "lwip/err.h"
|
||||
@ -102,4 +102,4 @@ u8_t snmp_asn1_enc_bits(u8_t *buf, u32_t buf_len, u32_t bit_value);
|
||||
|
||||
#endif /* LWIP_SNMP */
|
||||
|
||||
#endif /* LWIP_HDR_SNMP_ASN1_H */
|
||||
#endif /* LWIP_HDR_APPS_SNMP_ASN1_H */
|
||||
|
@ -30,8 +30,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef LWIP_HDR_SNMP_OPTS_H
|
||||
#define LWIP_HDR_SNMP_OPTS_H
|
||||
#ifndef LWIP_HDR_APPS_SNMP_OPTS_H
|
||||
#define LWIP_HDR_APPS_SNMP_OPTS_H
|
||||
|
||||
#include "lwip/opt.h"
|
||||
|
||||
@ -192,4 +192,4 @@
|
||||
#define SNMP_MIB_DEBUG LWIP_DBG_OFF
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HDR_SNMP_OPTS_H */
|
||||
#endif /* LWIP_HDR_APPS_SNMP_OPTS_H */
|
||||
|
@ -34,8 +34,8 @@
|
||||
* Author: Christiaan Simons <christiaan.simons@axon.tv>
|
||||
*/
|
||||
|
||||
#ifndef LWIP_HDR_SNMP_STRUCTS_H
|
||||
#define LWIP_HDR_SNMP_STRUCTS_H
|
||||
#ifndef LWIP_HDR_APPS_SNMP_STRUCTS_H
|
||||
#define LWIP_HDR_APPS_SNMP_STRUCTS_H
|
||||
|
||||
#include "lwip/opt.h"
|
||||
|
||||
@ -268,4 +268,4 @@ void mib2_get_snmpenableauthentraps(u8_t *value);
|
||||
|
||||
#endif /* LWIP_SNMP */
|
||||
|
||||
#endif /* LWIP_HDR_SNMP_STRUCTS_H */
|
||||
#endif /* LWIP_HDR_APPS_SNMP_STRUCTS_H */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007-2009 Frédéric Bernon, Simon Goldschmidt
|
||||
* Copyright (c) 2007-2009 Fr<EFBFBD>d<EFBFBD>ric Bernon, Simon Goldschmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
@ -26,11 +26,11 @@
|
||||
*
|
||||
* This file is part of the lwIP TCP/IP stack.
|
||||
*
|
||||
* Author: Frédéric Bernon, Simon Goldschmidt
|
||||
* Author: Fr<EFBFBD>d<EFBFBD>ric Bernon, Simon Goldschmidt
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_HDR_SNTP_H
|
||||
#define LWIP_HDR_SNTP_H
|
||||
#ifndef LWIP_HDR_APPS_SNTP_H
|
||||
#define LWIP_HDR_APPS_SNTP_H
|
||||
|
||||
#include "lwip/apps/sntp_opts.h"
|
||||
#include "lwip/ip_addr.h"
|
||||
@ -66,4 +66,4 @@ void sntp_servermode_dhcp(int set_servers_from_dhcp);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HDR_SNTP_H */
|
||||
#endif /* LWIP_HDR_APPS_SNTP_H */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007-2009 Frédéric Bernon, Simon Goldschmidt
|
||||
* Copyright (c) 2007-2009 Fr<EFBFBD>d<EFBFBD>ric Bernon, Simon Goldschmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
@ -26,11 +26,11 @@
|
||||
*
|
||||
* This file is part of the lwIP TCP/IP stack.
|
||||
*
|
||||
* Author: Frédéric Bernon, Simon Goldschmidt
|
||||
* Author: Fr<EFBFBD>d<EFBFBD>ric Bernon, Simon Goldschmidt
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_HDR_SNTP_OPTS_H
|
||||
#define LWIP_HDR_SNTP_OPTS_H
|
||||
#ifndef LWIP_HDR_APPS_SNTP_OPTS_H
|
||||
#define LWIP_HDR_APPS_SNTP_OPTS_H
|
||||
|
||||
#include "lwip/opt.h"
|
||||
|
||||
@ -156,4 +156,4 @@
|
||||
#define SNTP_RETRY_TIMEOUT_EXP 1
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HDR_SNTP_OPTS_H */
|
||||
#endif /* LWIP_HDR_APPS_SNTP_OPTS_H */
|
||||
|
Loading…
Reference in New Issue
Block a user