status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20 from jweyrich/rename_include_guards 

Rename all include guards to not clash with C99 (7.1.3 Reserved identifiers)
This commit is contained in:
Thomas BERNARD 2012-09-21 04:53:34 -07:00
parent 37b3feeab8 95d5c0bf39
commit 7fd91acb6c
54 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minissdpd/codelength.h
View File

@ -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

4
minissdpd/config.h
View File

@ -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

4
minissdpd/daemonize.h
View File

@ -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"

4
minissdpd/ifacewatch.h
View File

@ -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);

4
minissdpd/openssdpsocket.h
View File

@ -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

4
minissdpd/upnputils.h
View File

@ -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.

4
miniupnpc/codelength.h
View File

@ -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

4
miniupnpc/connecthostport.h
View File

@ -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

4
miniupnpc/declspec.h
View File

@ -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

4
miniupnpc/minisoap.h
View File

@ -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,

4
miniupnpc/minissdpc.h
View File

@ -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);

4
miniupnpc/miniupnpc.h
View File

@ -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"

4
miniupnpc/miniupnpctypes.h
View File

@ -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

4
miniupnpc/miniwget.h
View File

@ -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"

4
miniupnpc/minixml.h
View File

@ -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,

4
miniupnpc/portlistingparse.h
View File

@ -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 */

4
miniupnpc/receivedata.h
View File

@ -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

4
miniupnpc/upnpcommands.h
View File

@ -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"

4
miniupnpc/upnperrors.h
View File

@ -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"

4
miniupnpc/upnpreplyparse.h
View File

@ -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"

4
miniupnpd/codelength.h
View File

@ -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

4
miniupnpd/commonrdr.h
View File

@ -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"

4
miniupnpd/daemonize.h
View File

@ -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"

2
miniupnpd/genconfig.sh
View File

@ -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

4
miniupnpd/getconnstatus.h
View File

@ -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

4
miniupnpd/getifaddr.h
View File

@ -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

4
miniupnpd/getifstats.h
View File

@ -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;

4
miniupnpd/getroute.h
View File

@ -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,

4
miniupnpd/ifacewatcher.h
View File

@ -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"

4
miniupnpd/ipf/ipfrdr.h
View File

@ -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"

4
miniupnpd/ipfw/ipfwrdr.h
View File

@ -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"

4
miniupnpd/macros.h
View File

@ -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)

4
miniupnpd/minissdp.h
View File

@ -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"

4
miniupnpd/miniupnpdpath.h
View File

@ -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"

4
miniupnpd/miniupnpdtypes.h
View File

@ -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>

4
miniupnpd/minixml.h
View File

@ -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,

4
miniupnpd/natpmp.h
View File

@ -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

4
miniupnpd/netfilter/iptcrdr.h
View File

@ -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"

4
miniupnpd/netfilter/iptpinhole.h
View File

@ -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,

6
miniupnpd/options.h
View File

@ -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 */

4
miniupnpd/pf/obsdrdr.h
View File

@ -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"

4
miniupnpd/pf/pfpinhole.h
View File

@ -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,

4
miniupnpd/upnpdescgen.h
View File

@ -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"

4
miniupnpd/upnpdescstrings.h
View File

@ -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"

4
miniupnpd/upnpevents.h
View File

@ -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"

4
miniupnpd/upnpglobalvars.h
View File

@ -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"

4
miniupnpd/upnphttp.h
View File

@ -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>

4
miniupnpd/upnppermissions.h
View File

@ -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>

4
miniupnpd/upnppinhole.h
View File

@ -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"

4
miniupnpd/upnpredirect.h
View File

@ -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>

4
miniupnpd/upnpreplyparse.h
View File

@ -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"

4
miniupnpd/upnpsoap.h
View File

@ -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 */

4
miniupnpd/upnpurns.h
View File

@ -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"

4
miniupnpd/upnputils.h
View File

@ -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.