Adding upstream version 2:20.4+dfsg.upstream/2%20.4+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 27 insertions, 0 deletions

diff --git a/lib/libUPnP/patches/0021-platinum-fix-shadowed-local-var.patch b/lib/libUPnP/patches/0021-platinum-fix-shadowed-local-var.patch
new file mode 100644
index 0000000..f81b609
--- /dev/null
+++ b/lib/libUPnP/patches/0021-platinum-fix-shadowed-local-var.patch
@@ -0,0 +1,27 @@
+From f9eff4bb16d36222c265681576707407627cf161 Mon Sep 17 00:00:00 2001
+From: Memphiz <memphis@machzwo.de>
+Date: Sat, 25 May 2013 23:06:14 +0200
+Subject: [PATCH 21/24] platinum: fix shadowed local var
+
+---
+ lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
+index e303cc6..f733d5c 100644
+--- a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
++++ b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
+@@ -216,8 +216,8 @@ PLT_StateVariable::ValidateValue(const char* value)
+                         (const char*)*val,
+                         (const char*)m_Name);
+                     for (unsigned long i=0; i < m_AllowedValues.GetItemCount(); i++) {
+-                        NPT_String *val = *m_AllowedValues.GetItem(i);
+-                        NPT_LOG_WARNING_1("Allowed: %s", (const char*)*val);
++                        NPT_String *val2 = *m_AllowedValues.GetItem(i);
++                        NPT_LOG_WARNING_1("Allowed: %s", (const char*)*val2);
+                     }
+ #endif
+                     return NPT_ERROR_INVALID_PARAMETERS;
+-- 
+1.7.11.msysgit.0
+