Patch to fix subtitles compilation with GCC4

Message ID
State New

Commit Message

Ville Skyttä March 21, 2005, 9:08 p.m. UTC
  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 @@ 
+class cOsdProvider;
 class cOsd;
 class cMutex;
@@ -32,8 +33,8 @@ 
     void Unsubscribe( cOsdListener* listner );
-    friend class cOsdProvider;
-    friend class cOsd;
+    friend class ::cOsdProvider;
+    friend class ::cOsd;
     void Show();
     void Hide();
     void ShowHighest();