Rename all include guards to not clash with C99 (7.1.3 Reserved identifiers).

2012-09-20 17:52:51 -03:00 · 2012-09-20 17:52:51 -03:00 · 95d5c0bf39
parent 98c504f8b9
commit 95d5c0bf39
54 changed files with 108 additions and 108 deletions
--- a/minissdpd/codelength.h
+++ b/minissdpd/codelength.h
@ -4,8 +4,8 @@
 * copyright (c) 2005-2011 Thomas Bernard
 * This software is subjet to the conditions detailed in the
 * provided LICENCE file. */
-#ifndef __CODELENGTH_H__
-#define __CODELENGTH_H__
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED

 /* Encode length by using 7bit per Byte :
 * Most significant bit of each byte specifies that the
--- a/minissdpd/config.h
+++ b/minissdpd/config.h
@ -4,8 +4,8 @@
 * (c) 2006-2011 Thomas Bernard
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED

 /* use BSD daemon() ? */
 #define USE_DAEMON
--- a/minissdpd/daemonize.h
+++ b/minissdpd/daemonize.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __DAEMONIZE_H__
-#define __DAEMONIZE_H__
+#ifndef DAEMONIZE_H_INCLUDED
+#define DAEMONIZE_H_INCLUDED

 #include "config.h"

--- a/minissdpd/ifacewatch.h
+++ b/minissdpd/ifacewatch.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __IFACEWATCH_H__
-#define __IFACEWATCH_H__
+#ifndef IFACEWATCH_H_INCLUDED
+#define IFACEWATCH_H_INCLUDED

 int
 OpenAndConfInterfaceWatchSocket(void);
--- a/minissdpd/openssdpsocket.h
+++ b/minissdpd/openssdpsocket.h
@ -4,8 +4,8 @@
 * (c) 2006-2011 Thomas Bernard
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __OPENSSDPSOCKET_H__
-#define __OPENSSDPSOCKET_H__
+#ifndef OPENSSDPSOCKET_H_INCLUDED
+#define OPENSSDPSOCKET_H_INCLUDED

 /**
 * Open a socket and configure it for receiving SSDP packets
--- a/minissdpd/upnputils.h
+++ b/minissdpd/upnputils.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPUTILS_H__
-#define __UPNPUTILS_H__
+#ifndef UPNPUTILS_H_INCLUDED
+#define UPNPUTILS_H_INCLUDED

 /**
 * convert a struct sockaddr to a human readable string.
--- a/miniupnpc/codelength.h
+++ b/miniupnpc/codelength.h
@ -4,8 +4,8 @@
 * copyright (c) 2005-2011 Thomas Bernard
 * This software is subjet to the conditions detailed in the
 * provided LICENCE file. */
-#ifndef __CODELENGTH_H__
-#define __CODELENGTH_H__
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED

 /* Encode length by using 7bit per Byte :
 * Most significant bit of each byte specifies that the
--- a/miniupnpc/connecthostport.h
+++ b/miniupnpc/connecthostport.h
@ -5,8 +5,8 @@
 * Copyright (c) 2010-2012 Thomas Bernard
 * This software is subjects to the conditions detailed
 * in the LICENCE file provided within this distribution */
-#ifndef __CONNECTHOSTPORT_H__
-#define __CONNECTHOSTPORT_H__
+#ifndef CONNECTHOSTPORT_H_INCLUDED
+#define CONNECTHOSTPORT_H_INCLUDED

 /* connecthostport()
 * return a socket connected (TCP) to the host and port
--- a/miniupnpc/declspec.h
+++ b/miniupnpc/declspec.h
@ -1,5 +1,5 @@
-#ifndef __DECLSPEC_H__
-#define __DECLSPEC_H__
+#ifndef DECLSPEC_H_INCLUDED
+#define DECLSPEC_H_INCLUDED

 #if defined(_WIN32) && !defined(STATICLIB)
 	#ifdef MINIUPNP_EXPORTS
--- a/miniupnpc/minisoap.h
+++ b/miniupnpc/minisoap.h
@ -4,8 +4,8 @@
 * Copyright (c) 2005 Thomas Bernard
 * This software is subject to the conditions detailed in the
 * LICENCE file provided in this distribution. */
-#ifndef __MINISOAP_H__
-#define __MINISOAP_H__
+#ifndef MINISOAP_H_INCLUDED
+#define MINISOAP_H_INCLUDED

 /*int httpWrite(int, const char *, int, const char *);*/
 int soapPostSubmit(int, const char *, const char *, unsigned short,
--- a/miniupnpc/minissdpc.h
+++ b/miniupnpc/minissdpc.h
@ -5,8 +5,8 @@
 * Copyright (c) 2005-2007 Thomas Bernard
 * This software is subjects to the conditions detailed
 * in the LICENCE file provided within this distribution */
-#ifndef __MINISSDPC_H__
-#define __MINISSDPC_H__
+#ifndef MINISSDPC_H_INCLUDED
+#define MINISSDPC_H_INCLUDED

 struct UPNPDev *
 getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath);
--- a/miniupnpc/miniupnpc.h
+++ b/miniupnpc/miniupnpc.h
@ -5,8 +5,8 @@
 * Copyright (c) 2005-2012 Thomas Bernard
 * This software is subjects to the conditions detailed
 * in the LICENCE file provided within this distribution */
-#ifndef __MINIUPNPC_H__
-#define __MINIUPNPC_H__
+#ifndef MINIUPNPC_H_INCLUDED
+#define MINIUPNPC_H_INCLUDED

 #include "declspec.h"
 #include "igd_desc_parse.h"
--- a/miniupnpc/miniupnpctypes.h
+++ b/miniupnpc/miniupnpctypes.h
@ -4,8 +4,8 @@
 * Copyright (c) 2011 Thomas Bernard
 * This software is subject to the conditions detailed in the
 * LICENCE file provided within this distribution */
-#ifndef __MINIUPNPCTYPES_H__
-#define __MINIUPNPCTYPES_H__
+#ifndef MINIUPNPCTYPES_H_INCLUDED
+#define MINIUPNPCTYPES_H_INCLUDED

 #if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
 #define UNSIGNED_INTEGER unsigned long long
--- a/miniupnpc/miniwget.h
+++ b/miniupnpc/miniwget.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed in the
 * LICENCE file provided in this distribution.
 * */
-#ifndef __MINIWGET_H__
-#define __MINIWGET_H__
+#ifndef MINIWGET_H_INCLUDED
+#define MINIWGET_H_INCLUDED

 #include "declspec.h"

--- a/miniupnpc/minixml.h
+++ b/miniupnpc/minixml.h
@ -8,8 +8,8 @@
 * This software is subject to the conditions detailed in the
 * LICENCE file provided in this distribution.
 * */
-#ifndef __MINIXML_H__
-#define __MINIXML_H__
+#ifndef MINIXML_H_INCLUDED
+#define MINIXML_H_INCLUDED
 #define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))

 /* if a callback function pointer is set to NULL,
--- a/miniupnpc/portlistingparse.h
+++ b/miniupnpc/portlistingparse.h
@ -4,8 +4,8 @@
 * (c) 2011-2012 Thomas Bernard
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __PORTLISTINGPARSE_H__
-#define __PORTLISTINGPARSE_H__
+#ifndef PORTLISTINGPARSE_H_INCLUDED
+#define PORTLISTINGPARSE_H_INCLUDED

 #include "declspec.h"
 /* for the definition of UNSIGNED_INTEGER */
--- a/miniupnpc/receivedata.h
+++ b/miniupnpc/receivedata.h
@ -5,8 +5,8 @@
 * Copyright (c) 2011-2012 Thomas Bernard
 * This software is subjects to the conditions detailed
 * in the LICENCE file provided within this distribution */
-#ifndef __RECEIVEDATA_H__
-#define __RECEIVEDATA_H__
+#ifndef RECEIVEDATA_H_INCLUDED
+#define RECEIVEDATA_H_INCLUDED

 /* Reads data from the specified socket.
 * Returns the number of bytes read if successful, zero if no bytes were
--- a/miniupnpc/upnpcommands.h
+++ b/miniupnpc/upnpcommands.h
@ -4,8 +4,8 @@
 * Copyright (c) 2005-2011 Thomas Bernard
 * This software is subject to the conditions detailed in the
 * LICENCE file provided within this distribution */
-#ifndef __UPNPCOMMANDS_H__
-#define __UPNPCOMMANDS_H__
+#ifndef UPNPCOMMANDS_H_INCLUDED
+#define UPNPCOMMANDS_H_INCLUDED

 #include "upnpreplyparse.h"
 #include "portlistingparse.h"
--- a/miniupnpc/upnperrors.h
+++ b/miniupnpc/upnperrors.h
@ -5,8 +5,8 @@
 * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 * This software is subjet to the conditions detailed in the
 * provided LICENCE file. */
-#ifndef __UPNPERRORS_H__
-#define __UPNPERRORS_H__
+#ifndef UPNPERRORS_H_INCLUDED
+#define UPNPERRORS_H_INCLUDED

 #include "declspec.h"

--- a/miniupnpc/upnpreplyparse.h
+++ b/miniupnpc/upnpreplyparse.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPREPLYPARSE_H__
-#define __UPNPREPLYPARSE_H__
+#ifndef UPNPREPLYPARSE_H_INCLUDED
+#define UPNPREPLYPARSE_H_INCLUDED

 #if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
 #include "bsdqueue.h"
--- a/miniupnpd/codelength.h
+++ b/miniupnpd/codelength.h
@ -4,8 +4,8 @@
 * copyright (c) 2005-2011 Thomas Bernard
 * This software is subjet to the conditions detailed in the
 * provided LICENCE file. */
-#ifndef __CODELENGTH_H__
-#define __CODELENGTH_H__
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED

 /* Encode length by using 7bit per Byte :
 * Most significant bit of each byte specifies that the
--- a/miniupnpd/commonrdr.h
+++ b/miniupnpd/commonrdr.h
@ -4,8 +4,8 @@
 * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __COMMONRDR_H__
-#define __COMMONRDR_H__
+#ifndef COMMONRDR_H_INCLUDED
+#define COMMONRDR_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/daemonize.h
+++ b/miniupnpd/daemonize.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __DAEMONIZE_H__
-#define __DAEMONIZE_H__
+#ifndef DAEMONIZE_H_INCLUDED
+#define DAEMONIZE_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/genconfig.sh
+++ b/miniupnpd/genconfig.sh
@ -30,7 +30,7 @@ done

 RM="rm -f"
 CONFIGFILE="config.h"
-CONFIGMACRO="__CONFIG_H__"
+CONFIGMACRO="CONFIG_H_INCLUDED"

 # version reported in XML descriptions
 #UPNP_VERSION=20070827
--- a/miniupnpd/getconnstatus.h
+++ b/miniupnpd/getconnstatus.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __GETCONNSTATUS_H__
-#define __GETCONNSTATUS_H__
+#ifndef GETCONNSTATUS_H_INCLUDED
+#define GETCONNSTATUS_H_INCLUDED

 /**
 * get the connection status
--- a/miniupnpd/getifaddr.h
+++ b/miniupnpd/getifaddr.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __GETIFADDR_H__
-#define __GETIFADDR_H__
+#ifndef GETIFADDR_H_INCLUDED
+#define GETIFADDR_H_INCLUDED

 /* getifaddr()
 * take a network interface name and write the
--- a/miniupnpd/getifstats.h
+++ b/miniupnpd/getifstats.h
@ -4,8 +4,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __GETIFSTATS_H__
-#define __GETIFSTATS_H__
+#ifndef GETIFSTATS_H_INCLUDED
+#define GETIFSTATS_H_INCLUDED

 struct ifdata {
 	unsigned long opackets;
--- a/miniupnpd/getroute.h
+++ b/miniupnpd/getroute.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef  __GETROUTE_H__
-#define  __GETROUTE_H__
+#ifndef  GETROUTE_H_INCLUDED
+#define  GETROUTE_H_INCLUDED

 int
 get_src_for_route_to(const struct sockaddr * dst,
--- a/miniupnpd/ifacewatcher.h
+++ b/miniupnpd/ifacewatcher.h
@ -35,8 +35,8 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE. */

-#ifndef __IFACEWATCHER_H__
-#define __IFACEWATCHER_H__
+#ifndef IFACEWATCHER_H_INCLUDED
+#define IFACEWATCHER_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/ipf/ipfrdr.h
+++ b/miniupnpd/ipf/ipfrdr.h
@ -4,8 +4,8 @@
 * (c) 2006-2007 Thomas Bernard
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __IPFRDR_H__
-#define __IPFRDR_H__
+#ifndef IPFRDR_H_INCLUDED
+#define IPFRDR_H_INCLUDED

 #include "../commonrdr.h"

--- a/miniupnpd/ipfw/ipfwrdr.h
+++ b/miniupnpd/ipfw/ipfwrdr.h
@ -7,8 +7,8 @@
 * in the LICENCE file provided within the distribution
 */

-#ifndef __IPFWRDR_H__
-#define __IPFWRDR_H__
+#ifndef IPFWRDR_H_INCLUDED
+#define IPFWRDR_H_INCLUDED

 #include "../commonrdr.h"

--- a/miniupnpd/macros.h
+++ b/miniupnpd/macros.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __MACROS_H__
-#define __MACROS_H__
+#ifndef MACROS_H_INCLUDED
+#define MACROS_H_INCLUDED

 #define UNUSED(arg)	(void)(arg)

--- a/miniupnpd/minissdp.h
+++ b/miniupnpd/minissdp.h
@ -4,8 +4,8 @@
 * (c) 2006-2007 Thomas Bernard
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __MINISSDP_H__
-#define __MINISSDP_H__
+#ifndef MINISSDP_H_INCLUDED
+#define MINISSDP_H_INCLUDED

 #include "miniupnpdtypes.h"

--- a/miniupnpd/miniupnpdpath.h
+++ b/miniupnpd/miniupnpdpath.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __MINIUPNPDPATH_H__
-#define __MINIUPNPDPATH_H__
+#ifndef MINIUPNPDPATH_H_INCLUDED
+#define MINIUPNPDPATH_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/miniupnpdtypes.h
+++ b/miniupnpd/miniupnpdtypes.h
@ -4,8 +4,8 @@
 * (c) 2006-2012 Thomas Bernard
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __MINIUPNPDTYPES_H__
-#define __MINIUPNPDTYPES_H__
+#ifndef MINIUPNPDTYPES_H_INCLUDED
+#define MINIUPNPDTYPES_H_INCLUDED

 #include "config.h"
 #include <netinet/in.h>
--- a/miniupnpd/minixml.h
+++ b/miniupnpd/minixml.h
@ -8,8 +8,8 @@
 * This software is subject to the conditions detailed in the
 * LICENCE file provided in this distribution.
 * */
-#ifndef __MINIXML_H__
-#define __MINIXML_H__
+#ifndef MINIXML_H_INCLUDED
+#define MINIXML_H_INCLUDED
 #define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))

 /* if a callback function pointer is set to NULL,
--- a/miniupnpd/natpmp.h
+++ b/miniupnpd/natpmp.h
@ -3,8 +3,8 @@
 * author : Thomas Bernard
 * website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 */
-#ifndef __NATPMP_H__
-#define __NATPMP_H__
+#ifndef NATPMP_H_INCLUDED
+#define NATPMP_H_INCLUDED

 /* The NAT-PMP specification which can be found at the url :
 * http://files.dns-sd.org/draft-cheshire-nat-pmp.txt
--- a/miniupnpd/netfilter/iptcrdr.h
+++ b/miniupnpd/netfilter/iptcrdr.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __IPTCRDR_H__
-#define __IPTCRDR_H__
+#ifndef IPTCRDR_H_INCLUDED
+#define IPTCRDR_H_INCLUDED

 #include "../commonrdr.h"

--- a/miniupnpd/netfilter/iptpinhole.h
+++ b/miniupnpd/netfilter/iptpinhole.h
@ -4,8 +4,8 @@
 * (c) 2012 Thomas Bernard
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */
-#ifndef __IPTPINHOLE_H__
-#define __IPTPINHOLE_H__
+#ifndef IPTPINHOLE_H_INCLUDED
+#define IPTPINHOLE_H_INCLUDED

 #ifdef ENABLE_6FC_SERVICE
 int add_pinhole(const char * ifname,
--- a/miniupnpd/options.h
+++ b/miniupnpd/options.h
@ -6,8 +6,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __OPTIONS_H__
-#define __OPTIONS_H__
+#ifndef OPTIONS_H_INCLUDED
+#define OPTIONS_H_INCLUDED

 #include "config.h"

@ -74,5 +74,5 @@ extern unsigned int num_options;

 #endif /* DISABLE_CONFIG_FILE */

-#endif /* __OPTIONS_H__ */
+#endif /* OPTIONS_H_INCLUDED */

--- a/miniupnpd/pf/obsdrdr.h
+++ b/miniupnpd/pf/obsdrdr.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __OBSDRDR_H__
-#define __OBSDRDR_H__
+#ifndef OBSDRDR_H_INCLUDED
+#define OBSDRDR_H_INCLUDED

 #include "../commonrdr.h"

--- a/miniupnpd/pf/pfpinhole.h
+++ b/miniupnpd/pf/pfpinhole.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __PFPINHOLE_H__
-#define __PFPINHOLE_H__
+#ifndef PFPINHOLE_H_INCLUDED
+#define PFPINHOLE_H_INCLUDED

 #ifdef ENABLE_6FC_SERVICE
 int add_pinhole(const char * ifname,
--- a/miniupnpd/upnpdescgen.h
+++ b/miniupnpd/upnpdescgen.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPDESCGEN_H__
-#define __UPNPDESCGEN_H__
+#ifndef UPNPDESCGEN_H_INCLUDED
+#define UPNPDESCGEN_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/upnpdescstrings.h
+++ b/miniupnpd/upnpdescstrings.h
@ -4,8 +4,8 @@
 * (c) 2006-2012 Thomas Bernard
 * This software is subject to the coditions detailed in
 * the LICENCE file provided within the distribution */
-#ifndef __UPNPDESCSTRINGS_H__
-#define __UPNPDESCSTRINGS_H__
+#ifndef UPNPDESCSTRINGS_H_INCLUDED
+#define UPNPDESCSTRINGS_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/upnpevents.h
+++ b/miniupnpd/upnpevents.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPEVENTS_H__
-#define __UPNPEVENTS_H__
+#ifndef UPNPEVENTS_H_INCLUDED
+#define UPNPEVENTS_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/upnpglobalvars.h
+++ b/miniupnpd/upnpglobalvars.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPGLOBALVARS_H__
-#define __UPNPGLOBALVARS_H__
+#ifndef UPNPGLOBALVARS_H_INCLUDED
+#define UPNPGLOBALVARS_H_INCLUDED

 #include <time.h>
 #include "upnppermissions.h"
--- a/miniupnpd/upnphttp.h
+++ b/miniupnpd/upnphttp.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPHTTP_H__
-#define __UPNPHTTP_H__
+#ifndef UPNPHTTP_H_INCLUDED
+#define UPNPHTTP_H_INCLUDED

 #include <netinet/in.h>
 #include <sys/queue.h>
--- a/miniupnpd/upnppermissions.h
+++ b/miniupnpd/upnppermissions.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPPERMISSIONS_H__
-#define __UPNPPERMISSIONS_H__
+#ifndef UPNPPERMISSIONS_H_INCLUDED
+#define UPNPPERMISSIONS_H_INCLUDED

 #include <sys/types.h>
 #include <sys/socket.h>
--- a/miniupnpd/upnppinhole.h
+++ b/miniupnpd/upnppinhole.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPPINHOLE_H__
-#define __UPNPPINHOLE_H__
+#ifndef UPNPPINHOLE_H_INCLUDED
+#define UPNPPINHOLE_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/upnpredirect.h
+++ b/miniupnpd/upnpredirect.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPREDIRECT_H__
-#define __UPNPREDIRECT_H__
+#ifndef UPNPREDIRECT_H_INCLUDED
+#define UPNPREDIRECT_H_INCLUDED

 /* for u_int64_t */
 #include <sys/types.h>
--- a/miniupnpd/upnpreplyparse.h
+++ b/miniupnpd/upnpreplyparse.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPREPLYPARSE_H__
-#define __UPNPREPLYPARSE_H__
+#ifndef UPNPREPLYPARSE_H_INCLUDED
+#define UPNPREPLYPARSE_H_INCLUDED

 #if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
 #include "bsdqueue.h"
--- a/miniupnpd/upnpsoap.h
+++ b/miniupnpd/upnpsoap.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPSOAP_H__
-#define __UPNPSOAP_H__
+#ifndef UPNPSOAP_H_INCLUDED
+#define UPNPSOAP_H_INCLUDED

 /* ExecuteSoapAction():
 * this method executes the requested Soap Action */
--- a/miniupnpd/upnpurns.h
+++ b/miniupnpd/upnpurns.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPURNS_H__
-#define __UPNPURNS_H__
+#ifndef UPNPURNS_H_INCLUDED
+#define UPNPURNS_H_INCLUDED

 #include "config.h"

--- a/miniupnpd/upnputils.h
+++ b/miniupnpd/upnputils.h
@ -5,8 +5,8 @@
 * This software is subject to the conditions detailed
 * in the LICENCE file provided within the distribution */

-#ifndef __UPNPUTILS_H__
-#define __UPNPUTILS_H__
+#ifndef UPNPUTILS_H_INCLUDED
+#define UPNPUTILS_H_INCLUDED

 /**
 * convert a struct sockaddr to a human readable string.