From owner-svn-ports-head@FreeBSD.ORG Sat Nov 16 01:17:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC3CE6AA; Sat, 16 Nov 2013 01:17:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BDD7521E7; Sat, 16 Nov 2013 01:17:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAG1HKvM067137; Sat, 16 Nov 2013 01:17:20 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAG1HK73067135; Sat, 16 Nov 2013 01:17:20 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201311160117.rAG1HK73067135@svn.freebsd.org> From: Steve Wills Date: Sat, 16 Nov 2013 01:17:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333958 - head/net/mediatomb/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 01:17:21 -0000 Author: swills Date: Sat Nov 16 01:17:20 2013 New Revision: 333958 URL: http://svnweb.freebsd.org/changeset/ports/333958 Log: - Fix build on 10.0 PR: ports/181603 Submitted by: Laurent LEVIER Approved by: maintainer timeout (leo@mediatomb.cc, >2 months) Added: head/net/mediatomb/files/patch-clang (contents, props changed) Added: head/net/mediatomb/files/patch-clang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/mediatomb/files/patch-clang Sat Nov 16 01:17:20 2013 (r333958) @@ -0,0 +1,134 @@ +--- src/hash/dbr_hash.h.orig 2013-09-21 09:16:26.000000000 +0000 ++++ src/hash/dbr_hash.h 2013-09-21 09:20:41.000000000 +0000 +@@ -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); + } + */ + }; +--- src/hash/dbo_hash.h.orig 2013-09-21 09:23:08.000000000 +0000 ++++ src/hash/dbo_hash.h 2013-09-21 09:23:26.000000000 +0000 +@@ -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 +--- src/hash/dso_hash.h.orig 2013-09-21 09:25:09.000000000 +0000 ++++ src/hash/dso_hash.h 2013-09-21 09:25:27.000000000 +0000 +@@ -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 +--- tombupnp/upnp/src/genlib/net/http/webserver.c.orig 2013-09-30 04:20:49.000000000 +0000 ++++ tombupnp/upnp/src/genlib/net/http/webserver.c 2013-09-30 04:21:45.000000000 +0000 +@@ -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 ) + {