diff -Nurd mediatomb-0.12.1/src/hash/dbo_hash.h mediatomb-0.12.1-new/src/hash/dbo_hash.h --- mediatomb-0.12.1/src/hash/dbo_hash.h 2010-03-25 10:58:07.000000000 -0400 +++ mediatomb-0.12.1-new/src/hash/dbo_hash.h 2011-08-01 13:50:09.000000000 -0400 @@ -106,7 +106,7 @@ inline bool remove(KT key) { struct dbo_hash_slot *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) return false; slot->key = deletedKey; slot->value->release(); @@ -136,7 +136,7 @@ inline void put(KT key, zmm::Ref value) { struct dbo_hash_slot *slot; - search(key, &slot); + this->search(key, &slot); put(key, (hash_slot_t)slot, value); } void put(KT key, hash_slot_t destSlot, zmm::Ref value) @@ -162,7 +162,7 @@ inline zmm::Ref get(KT key) { struct dbo_hash_slot *slot; - bool found = search(key, &slot); + bool found = this->search(key, &slot); if (found) return zmm::Ref(slot->value); else @@ -174,7 +174,7 @@ inline zmm::Ref get(KT key, hash_slot_t *destSlot) { struct dbo_hash_slot **slot = (struct dbo_hash_slot **)destSlot; - bool found = search(key, slot); + bool found = this->search(key, slot); if (found) return zmm::Ref((*slot)->value); else diff -Nurd mediatomb-0.12.1/src/hash/dbr_hash.h mediatomb-0.12.1-new/src/hash/dbr_hash.h --- mediatomb-0.12.1/src/hash/dbr_hash.h 2010-03-25 10:58:07.000000000 -0400 +++ mediatomb-0.12.1-new/src/hash/dbr_hash.h 2011-08-01 13:50:09.000000000 -0400 @@ -124,7 +124,7 @@ inline bool remove(KT key) { struct dbr_hash_slot *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) return false; slot->key = deletedKey; int array_slot = slot->array_slot; @@ -134,7 +134,7 @@ return true; } data_array[array_slot] = data_array[--this->count]; - if (! search(data_array[array_slot], &slot)) + if (! this->search(data_array[array_slot], &slot)) { log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count); throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable")); @@ -146,7 +146,7 @@ inline void put(KT key) { struct dbr_hash_slot *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) { #ifdef TOMBDEBUG if (this->count >= realCapacity) @@ -194,7 +194,7 @@ inline bool exists(KT key) { struct dbr_hash_slot *slot; - return search(key, &slot); + return this->search(key, &slot); } /* @@ -202,7 +202,7 @@ inline bool exists(KT key, hash_slot_t *destSlot) { - return search(key, (KT **)destSlot); + return this->search(key, (KT **)destSlot); } */ }; diff -Nurd mediatomb-0.12.1/src/hash/dso_hash.h mediatomb-0.12.1-new/src/hash/dso_hash.h --- mediatomb-0.12.1/src/hash/dso_hash.h 2010-03-25 10:58:07.000000000 -0400 +++ mediatomb-0.12.1-new/src/hash/dso_hash.h 2011-08-01 13:50:09.000000000 -0400 @@ -100,7 +100,7 @@ inline bool remove(zmm::String key) { struct dso_hash_slot *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) return false; slot->key->release(); slot->value->release(); @@ -112,7 +112,7 @@ inline void put(zmm::String key, zmm::Ref value) { struct dso_hash_slot *slot; - search(key, &slot); + this->search(key, &slot); put(key, (hash_slot_t)slot, value); } void put(zmm::String key, hash_slot_t destSlot, zmm::Ref value) @@ -141,7 +141,7 @@ inline zmm::Ref get(zmm::String key) { struct dso_hash_slot *slot; - bool found = search(key, &slot); + bool found = this->search(key, &slot); if (found) return zmm::Ref(slot->value); else @@ -153,7 +153,7 @@ inline zmm::Ref get(zmm::String key, hash_slot_t *destSlot) { struct dso_hash_slot **slot = (struct dso_hash_slot **)destSlot; - bool found = search(key, slot); + bool found = this->search(key, slot); if (found) return zmm::Ref((*slot)->value); else diff -Nurd mediatomb-0.12.1/tombupnp/upnp/src/genlib/net/http/webserver.c mediatomb-0.12.1-new/tombupnp/upnp/src/genlib/net/http/webserver.c --- mediatomb-0.12.1/tombupnp/upnp/src/genlib/net/http/webserver.c 2010-03-25 10:58:12.000000000 -0400 +++ mediatomb-0.12.1-new/tombupnp/upnp/src/genlib/net/http/webserver.c 2011-08-01 13:52:07.000000000 -0400 @@ -310,7 +310,7 @@ * 0 - On Sucess * UPNP_E_OUTOF_MEMORY - on memory allocation failures ************************************************************************/ -XINLINE int +static XINLINE int get_content_type( IN const char *filename, OUT DOMString * content_type ) { --- a/src/timer.cc.orig 2010-03-25 15:58:11.000000000 +0100 +++ b/src/timer.cc 2015-03-08 22:18:05.760740000 +0100 @@ -33,12 +33,15 @@ #include "autoconfig.h" #endif +#include "singleton.h" + +class Timer; +SINGLETON_MUTEX(Timer, true); + #include "timer.h" using namespace zmm; -SINGLETON_MUTEX(Timer, true); - template <> Ref > > > Timer::getAppropriateSubscribers >() {