From patchwork Mon Mar 21 21:08:39 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: =?utf-8?q?Ville_Skytt=C3=A4?= <ville.skytta@iki.fi>
X-Patchwork-Id: 11816
Received: from smtp1.pp.htv.fi ([213.243.153.34])
	by www.linuxtv.org with esmtp (Exim 4.34) id 1DDUBO-0004BA-6I
	for vdr@linuxtv.org; Mon, 21 Mar 2005 22:11:30 +0100
Received: from cs78130200.pp.htv.fi (cs78130200.pp.htv.fi [62.78.130.200])
	by smtp1.pp.htv.fi (Postfix) with ESMTP id D5C307FC99;
	Mon, 21 Mar 2005 23:11:40 +0200 (EET)
From: Ville =?ISO-8859-1?Q?Skytt=E4?= <ville.skytta@iki.fi>
To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
Date: Mon, 21 Mar 2005 23:08:39 +0200
Message-Id: <1111439319.9841.36.camel@bobcat.mine.nu>
Mime-Version: 1.0
X-Mailer: Evolution 2.0.4 (2.0.4-1) 
Cc: vdr@virtanen.org
Subject: [vdr] Patch to fix subtitles compilation with GCC4
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Mar 2005 21:11:30 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 945

This patch fixes GCC4 compilation errors in osdcontroller.h from the DVB
subtitles patch.  Applies after DVBsubs.patch, obviously.

(Yep, GCC4 is not out yet, I'm testing a pre-release version.  Anyway,
it reports quite a few more warnings with various plugins than earlier
versions, plugin authors might be interested in having a look... the
subtitles plugin is the only one I've found that didn't compile yet.)

--- osdcontroller.h~	2005-03-21 22:50:46.904178920 +0200
+++ osdcontroller.h	2005-03-21 22:53:19.365810065 +0200
@@ -6,6 +6,7 @@
 
 #define MAX_OSD_LISTENERS 10
 
+class cOsdProvider;
 class cOsd;
 class cMutex;
 
@@ -32,8 +33,8 @@
     void Unsubscribe( cOsdListener* listner );
 
   private:
-    friend class cOsdProvider;
-    friend class cOsd;
+    friend class ::cOsdProvider;
+    friend class ::cOsd;
     void Show();
     void Hide();
     void ShowHighest();