Fix questionable C++ code instead of using "-ffriend-injection" option

(which might be removed from future GCC versions) to make this build
with GCC 4.1.x.

Patch tested by Thomas 'wiz' Klausner.

2 files changed, 78 insertions, 0 deletions

diff --git a/audio/daapd/patches/patch-ad b/audio/daapd/patches/patch-ad
new file mode 100644
index 00000000000..7810ff74532
--- /dev/null
+++ b/audio/daapd/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2006/07/03 13:58:31 tron Exp $
+
+--- daaplib/include/daap/tagoutput.h.orig	2006-07-03 10:56:28.000000000 +0100
++++ daaplib/include/daap/tagoutput.h	2006-07-03 10:39:27.000000000 +0100
+@@ -98,9 +98,7 @@
+ 			return( func( *this ));
+ 		}
+ 			
+-		friend inline TagOutput& end( TagOutput& x ) {
+-			return( x.closeTag());
+-		}
++		friend inline TagOutput& end( TagOutput& x );
+ 		
+ 	protected:
+ 		typedef std::vector<u8>  DataInt8;
+@@ -125,4 +123,8 @@
+ 		TagOutput( const TagOutput& );
+ 		TagOutput& operator = ( const TagOutput& );
+ 	};
++
++	inline TagOutput& end( TagOutput& x ) {
++		return( x.closeTag());
++	}
+ #endif
diff --git a/audio/daapd/patches/patch-ae b/audio/daapd/patches/patch-ae
new file mode 100644
index 00000000000..075f2543308
--- /dev/null
+++ b/audio/daapd/patches/patch-ae
@@ -0,0 +1,54 @@
+$NetBSD: patch-ae,v 1.1 2006/07/03 13:58:31 tron Exp $
+
+--- daaplib/include/daap/taginput.h.orig	2006-07-03 14:32:01.000000000 +0100
++++ daaplib/include/daap/taginput.h	2006-07-03 14:36:37.000000000 +0100
+@@ -71,9 +71,7 @@
+ 			return( func( *this ));
+ 		}
+ 			
+-		friend inline TagInput& end( TagInput& x ) {
+-			return( x.closeTag() );
+-		}
++		friend inline TagInput& end( TagInput& x );
+ 
+ 
+ 		//////
+@@ -95,15 +93,9 @@
+ 			return( *this );
+ 		}
+ 
+-		friend inline TagInput& skipTag( TagInput& x ) {
+-			x.skipTag();
+-			return( x );
+-		}
++		friend inline TagInput& skipTag( TagInput& x );
+ 
+-		friend inline TagInput& skipRestOfTag( TagInput& x ) {
+-			x.skipRestOfTag();
+-			return( x );
+-		}
++		friend inline TagInput& skipRestOfTag( TagInput& x );
+ 
+ 	protected:
+ 		typedef std::vector<u32> StackInt32;
+@@ -131,4 +123,20 @@
+ 		TagInput( const TagInput& );
+ 		TagInput& operator = ( const TagInput& );
+ 	};
++
++	inline TagInput& end( TagInput& x ) {
++		return( x.closeTag() );
++	}
++
++
++	inline TagInput& skipTag( TagInput& x ) {
++		x.skipTag();
++		return( x );
++	}
++
++	inline TagInput& skipRestOfTag( TagInput& x ) {
++		x.skipRestOfTag();
++		return( x );
++	}
++
+ #endif