From 2150bdc5b6854d380c2ab73ba02c68c4360a7d17 Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Sat, 21 Aug 2010 21:34:17 +0000 Subject: [PATCH] Forward port of svn rev. 568: The scope of the macro NUM_HANDLE is now restricted to upnpapi.c. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@570 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- ChangeLog | 3 +++ upnp/inc/upnp.h | 1 - upnp/src/api/upnpapi.c | 3 ++- upnp/src/inc/upnpapi.h | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1dcd7e..faf0eb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -211,6 +211,9 @@ Version 1.8.0 Version 1.6.7 ******************************************************************************* +2010-08-21 Marcelo Jimenez + * The scope of the macro NUM_HANDLE is now restricted to upnpapi.c. + 2010-08-21 Marcelo Jimenez * InitHandleList() has never been implemented, I guess no one has ever called it, so remove it. diff --git a/upnp/inc/upnp.h b/upnp/inc/upnp.h index c37b308..bc4d268 100644 --- a/upnp/inc/upnp.h +++ b/upnp/inc/upnp.h @@ -85,7 +85,6 @@ #endif -#define NUM_HANDLE 200 #define LINE_SIZE 180 #define NAME_SIZE 256 #define MNFT_NAME_SIZE 64 diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c index a863eaf..120eab6 100644 --- a/upnp/src/api/upnpapi.c +++ b/upnp/src/api/upnpapi.c @@ -165,7 +165,8 @@ unsigned short LOCAL_PORT_V4; unsigned short LOCAL_PORT_V6; /*! UPnP device and control point handle table */ -void *HandleTable[NUM_HANDLE]; +#define NUM_HANDLE 200 +static void *HandleTable[NUM_HANDLE]; /*! a local dir which serves as webserver root */ extern membuffer gDocumentRootDir; diff --git a/upnp/src/inc/upnpapi.h b/upnp/src/inc/upnpapi.h index 06486f5..4b81cb0 100644 --- a/upnp/src/inc/upnpapi.h +++ b/upnp/src/inc/upnpapi.h @@ -50,8 +50,6 @@ #define DEV_LIMIT 200 -#define NUM_HANDLE 200 - #define DEFAULT_MX 5 #define DEFAULT_MAXAGE 1800