[vdr] Re: [ANNOUNCE] calendar-0.1.0

[Jan Ekholm <chakie@infa.abo.fi>]

Compiling gives me this:

g++ -O2 -Wall -Woverloaded-virtual -c -DPLUGIN_NAME_I18N='"calendar"'
-I../../../include -I../../../../DVB/include menu.c
menu.c:11:1: warning: "_GNU_SOURCE" redefined
menu.c:1:1: warning: this is the location of the previous definition
menu.c:18:28: vdr/../../menu.c: Tiedostoa tai hakemistoa ei ole
In file included from menu.c:25:
menusetup.c: In constructor `cMenuCalendarSetup::cMenuCalendarSetup()':
menusetup.c:31: syntax error before `(' token
menusetup.c:32: syntax error before `(' token
menusetup.c:33: syntax error before `(' token
menusetup.c:35: syntax error before `(' token
menu.c: In member function `eOSState cMenuWhatsOnCal::ShowDetails()':
menu.c:255: `cMenuSchedule' undeclared (first use this function)
menu.c:255: (Each undeclared identifier is reported only once for each
function it appears in.)
../../../include/vdr/osd.h:135: `cOsdMenu*cOsdMenu::subMenu' is private
menu.c:255: within this context
menu.c:255: syntax error before `(' token
../../../include/vdr/osd.h:135: `cOsdMenu*cOsdMenu::subMenu' is private
menu.c:256: within this context
../../../include/vdr/osd.h:135: `cOsdMenu*cOsdMenu::subMenu' is private
menu.c:269: within this context
make: *** [menu.o] Error 1


The _GNU_SOURCE one is easy to fix. You also have includes like:

#include <vdr/../../menu.c>

That will break horribly at least for me. Removing the ../.. and it all
works ok. I've attached a little patch that makes it compile for me.

-- 
  The trouble with being a god is that you've got no one to pray to.
                                        -- Terry Pratchett, Small Gods
diff -ruN calendar-0.1.0/menu.c calendar-0.1.0-ok/menu.c
--- calendar-0.1.0/menu.c	2003-09-10 22:16:01.000000000 +0300
+++ calendar-0.1.0-ok/menu.c	2003-09-11 09:42:55.000000000 +0300
@@ -8,14 +8,16 @@
  */
 
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <string.h>
 
 #include <vdr/i18n.h>
 #include <vdr/channels.h>
 #include <vdr/eit.h>
-#include <vdr/../../menu.c>
+#include <vdr/menu.c>
 
 #include "menu.h"
 #include "menuitem.h"
diff -ruN calendar-0.1.0/menuitem.c calendar-0.1.0-ok/menuitem.c
--- calendar-0.1.0/menuitem.c	2003-09-10 22:53:38.000000000 +0300
+++ calendar-0.1.0-ok/menuitem.c	2003-09-11 09:41:13.000000000 +0300
@@ -8,8 +8,9 @@
  */
 
 
-
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <string.h>
 
diff -ruN calendar-0.1.0/menusetup.c calendar-0.1.0-ok/menusetup.c
--- calendar-0.1.0/menusetup.c	2003-09-10 22:22:23.000000000 +0300
+++ calendar-0.1.0-ok/menusetup.c	2003-09-11 09:41:24.000000000 +0300
@@ -8,7 +8,9 @@
  */
 
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <string.h>