patches for FreeBSD

11 files changed, 31 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index 259f133..355a001 100644
--- a/HISTORY
+++ b/HISTORY
@@ -99,6 +99,7 @@ new:
 - Avoid repeats: in 'compare summary' one can now adjust the required match, default is 90%.
 - if there is no subtitle the filename now defaults to YYYY.MM.DD-HH.MM-Weekday to ease 
   sorting in some frontends, thanks to Dominic Evans for providing a patch
+- should now compile in FreeBSD, thanks to Juergen Lock for providing a patch
 
 fixes:
 - fixed a crash when pressing 'Ok' in an empty timers done menu
diff --git a/HISTORY.DE b/HISTORY.DE
index 22555da..c3b8d9c 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -105,6 +105,7 @@ neu:
 - falls kein Episodenname existiert, wird nun als Dateiname YYYY.MM.DD-HH.MM-Weekday
   verwendet, um die Sortierung in manchen Frontends zu erleichtern. Danke an Dominic 
   Evans für einen Patch.
+- sollte nun auch unter FreeBSD compilieren, Danke an Juergen Lock für einen Patch
 
 fixes:
 - Absturz beim Drücken von 'Ok' in leerem Menü erledigter Timer behoben
diff --git a/createcats.c b/createcats.c
index 2113923..3e0364c 100644
--- a/createcats.c
+++ b/createcats.c
@@ -36,6 +36,12 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #define KILOBYTE(n) ((n) * 1024)
 #define MAXPARSEBUFFER KILOBYTE(10)
 
+#ifdef __FreeBSD__
+#ifdef isnumber
+#undef isnumber
+#endif
+#endif
+
 bool isnumber(const char *s)
 {
   if (!*s)
diff --git a/distance.c b/distance.c
index b2539af..a5248b7 100644
--- a/distance.c
+++ b/distance.c
@@ -32,7 +32,11 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 
 #include "distance.h"
 #include <string.h>
+#ifdef __FreeBSD__
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 #include <vdr/tools.h>
 
 
diff --git a/epgsearch.c b/epgsearch.c
index 222a8ce..c4af93b 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -30,6 +30,9 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 #include <vdr/epg.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 #include <getopt.h>
 #include "menu_event.h"
 #include "menu_main.h"
diff --git a/epgsearchtools.c b/epgsearchtools.c
index 71a83a1..926818c 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -28,7 +28,9 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include <ctype.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 #include "uservars.h"
 #include "epgsearchtools.h"
 #include "epgsearchext.h"
diff --git a/menu_deftimercheckmethod.c b/menu_deftimercheckmethod.c
index a5d11f7..8db130a 100644
--- a/menu_deftimercheckmethod.c
+++ b/menu_deftimercheckmethod.c
@@ -21,6 +21,9 @@ The author can be reached at cwieninger@gmx.de
 The project's page is at http://winni.vdr-developer.org/epgsearch
 */
 
+#ifdef __FreeBSD__
+#include <stdint.h>
+#endif
 #include "menu_deftimercheckmethod.h"
 #include "menu_myedittimer.h"
 
diff --git a/menu_whatson.c b/menu_whatson.c
index 1579515..826e564 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -106,7 +106,7 @@ bool cMenuMyScheduleItem::Update(bool Force)
 		    frac = ((now - startTime) * 8 + (dur >> 1)) / dur;
 		}
 	      if (mode == showNext)
-		frac = (  ( 30*60 - min((long int)30*60, startTime - now) ) * 8 + 15*60  ) / (30*60);
+		frac = (  ( 30*60 - min((time_t)30*60, startTime - now) ) * 8 + 15*60  ) / (30*60);
 	      
 	      frac = min(8,max(0, frac));
 	      
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 3045529..5cd2e7a 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -22,6 +22,9 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 */
 
 #include <vector>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 #include "searchtimer_thread.h"
 #include "epgsearchcfg.h"
 #include "epgsearchcats.h"
diff --git a/timer_thread.c b/timer_thread.c
index 45a95d1..d312fdb 100644
--- a/timer_thread.c
+++ b/timer_thread.c
@@ -23,6 +23,9 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 
 #include <string>
 #include <list>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 #include "timer_thread.h"
 #include "epgsearchcfg.h"
 #include "epgsearchtools.h"
diff --git a/uservars.c b/uservars.c
index 08d2a3d..68e259a 100644
--- a/uservars.c
+++ b/uservars.c
@@ -22,6 +22,9 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 */
 
 #include <algorithm>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 #include "uservars.h"
 #include "epgsearchcats.h"
 #include "epgsearchtools.h"