From 1213ecc20171d1ad307b6b5975fad1f5a3e10a64 Mon Sep 17 00:00:00 2001
From: junukn <junukn@1f4bef6d-8e0a-0410-8695-e467da8aaccf>
Date: Tue, 16 May 2006 21:25:51 +0000
Subject: allow to compile with VDR smaller than 10347

git-svn-id: svn://svn.berlios.de/ffnetdev/trunk@18 1f4bef6d-8e0a-0410-8695-e467da8aaccf
---
 ffnetdev.c     | 2 +-
 ffnetdev.h     | 9 +++++++--
 remote.c       | 2 ++
 tools/socket.c | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ffnetdev.c b/ffnetdev.c
index 6c4835a..f4df53d 100644
--- a/ffnetdev.c
+++ b/ffnetdev.c
@@ -136,7 +136,7 @@ cString cPluginFFNetDev::Active(void) {
  
     return NULL;
 }
-#elif
+#elseif
 bool cPluginFFNetDev::Active(void) {
     return (cOSDWorker::Active() || cTSWorker::Active());
 }
diff --git a/ffnetdev.h b/ffnetdev.h
index cd9848c..9ea5ec5 100644
--- a/ffnetdev.h
+++ b/ffnetdev.h
@@ -40,13 +40,18 @@ public:
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
+  
+#ifndef VDRVERSNUM
+#define VDRVERSNUM 10346
+#endif
 
 #if VDRVERSNUM >= 10347
   virtual cString Active(void);
-#elif
+#elseif
   virtual bool Active(void);
 #endif
-  
+ 
+
   void SetPrimaryDevice();
   void RestorePrimaryDevice();
   cMyRemote *GetRemote() { return m_Remote; }
diff --git a/remote.c b/remote.c
index 806e42a..dbfd0ac 100644
--- a/remote.c
+++ b/remote.c
@@ -29,9 +29,11 @@ bool cMyRemote::Initialize(void)
 
 bool cMyRemote::Put(uint64 Code, bool Repeat, bool Release)
 {
+#if VDRVERSNUM >= 10347
     if ((cRemote::IsLearning()) && (Release))
 	return false;
     else
+#endif
 	return cRemote::Put(Code, Repeat ,Release);
 }
 
diff --git a/tools/socket.c b/tools/socket.c
index 1323ddd..2061dec 100644
--- a/tools/socket.c
+++ b/tools/socket.c
@@ -88,7 +88,7 @@ bool cTBSocket::Listen(const std::string &Ip, unsigned int Port, int BackLog) {
 	return true;
 
 closefd:
-    :close(socket);
+    ::close(socket);
     return false;
 }
 
-- 
cgit v1.2.3