diff -Nru freecell-0.0.2/cards.c freecell-0.0.2-n/cards.c --- freecell-0.0.2/cards.c 2004-08-14 14:02:55.000000000 +0200 +++ freecell-0.0.2-n/cards.c 2006-11-05 03:24:28.000000000 +0100 @@ -52,7 +52,11 @@ mX = X; mY = Y; mStacked = Stacked; +#if VDRVERSNUM >= 10318 + mSeed = cTimeMs::Now(); +#else mSeed = time_ms(); +#endif } cCardStack::~cCardStack() { diff -Nru freecell-0.0.2/Makefile freecell-0.0.2-n/Makefile --- freecell-0.0.2/Makefile 2004-03-21 01:54:39.000000000 +0100 +++ freecell-0.0.2-n/Makefile 2006-11-05 03:24:28.000000000 +0100 @@ -31,7 +31,7 @@ ### The version number of VDR (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ### The name of the distribution archive: @@ -54,7 +54,7 @@ DEFINES += -DTOOLBOX_DEBUG -DDEBUG CXXFLAGS += -g else - CXXFLAGS += -O2 + CXXFLAGS += -fPIC -O2 endif ### Implicit rules: @@ -77,7 +77,7 @@ libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + @cp $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff -Nru freecell-0.0.2/tools/list.h freecell-0.0.2-n/tools/list.h --- freecell-0.0.2/tools/list.h 2004-02-11 13:33:26.000000000 +0100 +++ freecell-0.0.2-n/tools/list.h 2006-11-05 03:24:28.000000000 +0100 @@ -90,22 +90,22 @@ T &SetNextCurrent (); T &SetPrevCurrent (); - friend cTBList &operator+= <> (cTBList &list1, const cTBList &list2); - friend cTBList &operator+= <> (cTBList &list, const T &element); +// friend cTBList &operator+= <> (cTBList &list1, const cTBList &list2); +// friend cTBList &operator+= <> (cTBList &list, const T &element); - friend cTBList operator+ <> (const cTBList &list1, const cTBList &list2); - friend cTBList operator+ <> (const T &element, const cTBList &list); - friend cTBList operator+ <> (const cTBList &list, const T &element); +// friend cTBList operator+ <> (const cTBList &list1, const cTBList &list2); +// friend cTBList operator+ <> (const T &element, const cTBList &list); +// friend cTBList operator+ <> (const cTBList &list, const T &element); /*friend cSource &operator<< <> (cSource &dest, const cTBList &list); - friend cSource &operator>> <> (cSource &dest, cTBList &list);*/ +// friend cSource &operator>> <> (cSource &dest, cTBList &list);*/ }; // Template Implementation (inline funcs) template inline int cTBList::Find (const T & i) { - cTBList::cItem *item = m_First; + typename cTBList::cItem *item = m_First; int index = 0; while (item && (item->Data != i)) { @@ -203,7 +203,7 @@ template typename cTBList::cItem *cTBList::NewItem (cTBList::cItem *pBefore, cTBList::cItem *pAfter) const { - cTBList::cItem *item = new cTBList::cItem; + typename cTBList::cItem *item = new typename cTBList::cItem; item->Next = pAfter; item->Prev = pBefore; @@ -235,7 +235,7 @@ if ((int)idx == m_CurPos) return m_Current; - cTBList::cItem *item; + typename cTBList::cItem *item; int dist = idx - m_CurPos; bool direct; @@ -271,7 +271,7 @@ template T &cTBList::Prepend () { - cTBList::cItem *item = NewItem(NULL, m_First); + typename cTBList::cItem *item = NewItem(NULL, m_First); m_First = m_Current = item; if (!m_Last) @@ -285,7 +285,7 @@ template T &cTBList::Append () { - cTBList::cItem *item = NewItem(m_Last, NULL); + typename cTBList::cItem *item = NewItem(m_Last, NULL); m_Last = m_Current = item; if (!m_First) @@ -317,13 +317,13 @@ return true; } - cTBList::cItem *nextItem = Locate(idx); + typename cTBList::cItem *nextItem = Locate(idx); if (!nextItem) return false; - cTBList::cItem *prevItem = nextItem->Prev; + typename cTBList::cItem *prevItem = nextItem->Prev; - cTBList::cItem *item = NewItem(prevItem, nextItem); + typename cTBList::cItem *item = NewItem(prevItem, nextItem); item->Data = i; m_CurPos = idx; @@ -338,7 +338,7 @@ if (!m_Current) return NULL; - cTBList::cItem *item = m_Current; + typename cTBList::cItem *item = m_Current; if (item == m_First) { if (m_First = item->Next) m_First->Prev = NULL; @@ -370,7 +370,7 @@ if (Find(i) == -1) return false; - cTBList::cItem *item = Unlink(); + typename cTBList::cItem *item = Unlink(); if (!item) return false; @@ -383,7 +383,7 @@ if (!Locate(idx)) return false; - cTBList::cItem *item = Unlink(); + typename cTBList::cItem *item = Unlink(); if (!item) return false; @@ -412,13 +412,13 @@ template void cTBList::Clear () { - cTBList::cItem *item = m_First; + typename cTBList::cItem *item = m_First; m_First = m_Last = m_Current = NULL; m_Count = 0; m_CurPos = -1; - cTBList::cItem *Prev; + typename cTBList::cItem *Prev; while (item) { Prev = item; item = item->Next;