Packman Build Service PMBS

File mediatomb.patch of Package mediatomb (Revision 24)

Currently displaying revision 24 , Show latest

--- a/src/string_converter.cc
+++ b/src/string_converter.cc
@@ -130,7 +130,7 @@ zmm::String StringConverter::_convert(St
     
     //log_debug(("iconv: BEFORE: input bytes left: %d  output bytes left: %d\n",
     //       input_bytes, output_bytes));
-#if defined(ICONV_CONST) || defined(SOLARIS)
+#if 0
     ret = iconv(cd, (const char**)input_ptr, &input_bytes,
             output_ptr, &output_bytes);
 #else
--- a/tombupnp/upnp/src/api/upnpapi.c
+++ b/tombupnp/upnp/src/api/upnpapi.c
@@ -104,6 +104,12 @@
 /*
  ****************** */
 
+membuffer gUserHTTPHeaders;
+int gMaxHTTPTimeoutRetries;
+int gUpnpSdkShutdown;
+userHTTPHeaderList *pUserHTTPHeaderList;
+virtualDirList *pVirtualDirList;
+
 //Mutex to synchronize the subscription handling at the client side
 CLIENTONLY( ithread_mutex_t GlobalClientSubscribeMutex;
      )
--- a/tombupnp/upnp/src/inc/upnpapi.h
+++ b/tombupnp/upnp/src/inc/upnpapi.h
@@ -192,17 +192,16 @@ void UpnpThreadDistribution(struct UpnpN
 void AutoAdvertise(void *input); 
 int getlocalhostname(char *out);
 
-virtualDirList *pVirtualDirList;
-userHTTPHeaderList *pUserHTTPHeaderList;
+extern userHTTPHeaderList *pUserHTTPHeaderList;
 // concatenated list of custom http headers
-membuffer gUserHTTPHeaders;
+extern membuffer gUserHTTPHeaders;
 
 
 extern WebServerState bWebServerState;
 
-int gUpnpSdkShutdown;
+extern int gUpnpSdkShutdown;
 
-int gMaxHTTPTimeoutRetries;
+extern int gMaxHTTPTimeoutRetries;
 #endif