CVS putt? oder bin ich nur zu blöd

Kreuzuebersetzer, Diskussion über Änderungen im Tuxbox-CDK und Tuxbox-CVS
XhorRah
Interessierter
Interessierter
Beiträge: 70
Registriert: Donnerstag 1. April 2004, 16:52

CVS putt? oder bin ich nur zu blöd

Beitrag von XhorRah »

Hi,
also ich hab da wieder mal ein kleines problem. Nach einem erneuten auschecken der sourcen tritt folgender Fehler auf:

LOG:

-c -o zapit.o `test -f 'zapit.cpp' || echo './'`zapit.cpp; \
then mv -f ".deps/zapit.Tpo" ".deps/zapit.Po"; \
else rm -f ".deps/zapit.Tpo"; exit 1; \
fi
zapit.cpp:242: error: parse error before `<<' token
zapit.cpp: In function `int zapit(long long unsigned int, bool, unsigned int)':
zapit.cpp:253: error: parse error before `==' token
zapit.cpp:261: error: parse error before `<<' token
zapit.cpp:273: error: ISO C++ forbids declaration of `cit' with no type
zapit.cpp:273: error: conflicting types for `int cit'
zapit.cpp:258: error: previous declaration as `tallchans_iterator cit'
zapit.cpp:273: error: `channel_id' undeclared (first use this function)
zapit.cpp:273: error: (Each undeclared identifier is reported only once for
each function it appears in.)
zapit.cpp:275: error: parse error before `if'
zapit.cpp:282: error: ISO C++ forbids declaration of `cit' with no type
zapit.cpp:282: error: redefinition of `int cit'
zapit.cpp:273: error: `int cit' previously defined here
zapit.cpp:284: error: parse error before `if'
zapit.cpp:302: error: ISO C++ forbids declaration of `current_transponder_id'
with no type
zapit.cpp:302: error: conflicting types for `int current_transponder_id'
zapit.cpp:259: error: previous declaration as `transponder_id_t
current_transponder_id'
zapit.cpp:303: error: parse error before `}' token
zapit.cpp:309: error: ISO C++ forbids declaration of `stopPlayBack' with no
type
zapit.cpp:312: error: parse error before `if'
zapit.cpp:317: error: ISO C++ forbids declaration of `printf' with no type
zapit.cpp:317: error: `int printf' redeclared as different kind of symbol
/root/dbox/dbox2/neutrino/cdk/powerpc-tuxbox-linux-gnu/include/stdio.h:298: error: previous
declaration of `int printf(const char*, ...)'
zapit.cpp:317: error: initializer list being treated as compound expression
zapit.cpp:318: error: syntax error before `->' token
zapit.cpp:320: error: ISO C++ forbids declaration of `waitForMotor' with no
type
zapit.cpp:320: error: redefinition of `int waitForMotor'
zapit.cpp:111: error: `int waitForMotor' previously defined here
zapit.cpp:321: error: ISO C++ forbids declaration of `printf' with no type
zapit.cpp:321: error: redefinition of `int printf'
zapit.cpp:317: error: `int printf' previously declared here
zapit.cpp:321: error: initializer list being treated as compound expression
zapit.cpp:322: error: syntax error before `->' token
zapit.cpp:323: error: ISO C++ forbids declaration of `sleep' with no type
zapit.cpp:323: error: `int sleep' redeclared as different kind of symbol
/root/dbox/dbox2/neutrino/cdk/powerpc-tuxbox-linux-gnu/include/unistd.h:371: error: previous
declaration of `unsigned int sleep(unsigned int)'
zapit.cpp:325: error: syntax error before `->' token
zapit.cpp:337: error: ISO C++ forbids declaration of `t' with no type
zapit.cpp:337: error: conflicting types for `int t'
zapit.cpp:336: error: previous declaration as `
std::_Rb_tree_iterator<std::pair<const transponder_id_t, transponder>,
std::pair<const transponder_id_t, transponder>&, std::pair<const
transponder_id_t, transponder>*> t'
zapit.cpp:338: error: parse error before `if'
zapit.cpp:342: error: base operand of `->' is not a pointer
zapit.cpp:342: error: base operand of `->' is not a pointer
zapit.cpp:342: error: base operand of `->' is not a pointer
zapit.cpp:343: error: parse error before `switch'
zapit.cpp:346: error: ISO C++ forbids declaration of `tuned_transponder_id'
with no type
zapit.cpp:347: error: parse error before `return'
zapit.cpp:355: error: ISO C++ forbids declaration of `transponder_change' with
no type
zapit.cpp:357: error: ISO C++ forbids declaration of `tuned_transponder_id'
with no type
zapit.cpp:357: error: redefinition of `int tuned_transponder_id'
zapit.cpp:346: error: `int tuned_transponder_id' previously defined here
zapit.cpp:358: error: parse error before `}' token
zapit.cpp:365: error: parse error before `if'
zapit.cpp:370: error: ISO C++ forbids declaration of `saveSettings' with no
type
zapit.cpp:370: error: `int saveSettings' redeclared as different kind of symbol
zapit.cpp:156: error: previous declaration of `void saveSettings(bool)'
zapit.cpp:371: error: parse error before `return'
zapit.cpp:393: error: syntax error before `->' token
zapit.cpp:401: error: ISO C++ forbids declaration of `failed' with no type
zapit.cpp:402: error: parse error before `}' token
zapit.cpp:407: error: ISO C++ forbids declaration of `failed' with no type
zapit.cpp:407: error: redefinition of `int failed'
zapit.cpp:401: error: `int failed' previously defined here
zapit.cpp:408: error: parse error before `}' token
zapit.cpp:410: error: syntax error before `->' token
zapit.cpp:414: error: ISO C++ forbids declaration of `failed' with no type
zapit.cpp:414: error: redefinition of `int failed'
zapit.cpp:407: error: `int failed' previously defined here
zapit.cpp:415: error: parse error before `}' token
zapit.cpp:435: error: parse error before `;' token
zapit.cpp:435: error: syntax error before `++' token
zapit.cpp:438: error: syntax error before `->' token
zapit.cpp:442: error: ISO C++ forbids declaration of `startPlayBack' with no
type
zapit.cpp:442: error: `int startPlayBack' redeclared as different kind of
symbol
../include/zapit/zapit.h:26: error: previous declaration of `int
startPlayBack(CZapitChannel*)'
zapit.cpp:442: error: invalid conversion from `CZapitChannel*' to `int'
zapit.cpp:443: error: syntax error before `->' token
zapit.cpp:444: error: ISO C++ forbids declaration of `saveSettings' with no
type
zapit.cpp:444: error: redefinition of `int saveSettings'
zapit.cpp:370: error: `int saveSettings' previously defined here
zapit.cpp:446: error: parse error before `if'
zapit.cpp: In function `int select_nvod_subservice_num(int)':
zapit.cpp:464: warning: comparison between signed and unsigned integer
expressions
zapit.cpp: In function `int change_audio_pid(unsigned char)':
zapit.cpp:491: error: `remember_selected_audio' undeclared (first use this
function)
zapit.cpp: In function `bool parse_command(CBasicMessage::Header&, int)':
zapit.cpp:1156: error: `startPlayBack' cannot be used as a function
zapit.cpp:1290: error: use of `printf' is ambiguous
zapit.cpp:321: error: first declared as `int printf' here
<internal>:1290: error: also declared as `int std::printf(const char*, ...)'
here
zapit.cpp:1290: error: `printf' undeclared (first use this function)
zapit.cpp: In function `int startPlayBack(CZapitChannel*)':
zapit.cpp:1509: error: `int startPlayBack(CZapitChannel*)' redeclared as
different kind of symbol
zapit.cpp:442: error: previous declaration of `int startPlayBack'
zapit.cpp:442: error: previous non-function declaration `int startPlayBack'
zapit.cpp:1509: error: conflicts with function declaration `int
startPlayBack(CZapitChannel*)'
zapit.cpp: In function `void enterStandby()':
zapit.cpp:1616: error: `sleep' cannot be used as a function
zapit.cpp:1622: error: `saveSettings' cannot be used as a function
zapit.cpp: In function `int main(int, char**)':
zapit.cpp:1790: error: `printf' undeclared (first use this function)
/root/dbox/dbox2/neutrino/cdk/include/c++/3.3.5/bits/stl_map.h: In function `
void _GLOBAL__D_cam()':
zapit.cpp:238: warning: `transponder_id_t tuned_transponder_id' defined but not
used
{standard input}: Assembler messages:
{standard input}:572: Error: symbol `_ZZ5zapitybjE6printf' is already defined
{standard input}:607: Error: symbol `_ZZ5zapitybjE3cit' is already defined
{standard input}:619: Error: symbol `_ZZ5zapitybjE20tuned_transponder_id' is already defined
{standard input}:654: Error: symbol `_ZZ5zapitybjE6failed' is already defined
{standard input}:660: Error: symbol `_ZZ5zapitybjE6failed' is already defined
{standard input}:665: Error: symbol `_ZZ5zapitybjE12saveSettings' is already defined
make[4]: *** [zapit.o] Fehler 1
make[4]: Leaving directory `/root/dbox/tuxbox-cvs/neutrino/apps/dvb/zapit/src'
make[3]: *** [all-recursive] Fehler 1
make[3]: Leaving directory `/root/dbox/tuxbox-cvs/neutrino/apps/dvb/zapit/src'
make[2]: *** [all-recursive] Fehler 1
make[2]: Leaving directory `/root/dbox/tuxbox-cvs/neutrino/apps/dvb/zapit'
make[1]: *** [all] Fehler 2
make[1]: Leaving directory `/root/dbox/tuxbox-cvs/neutrino/apps/dvb/zapit'
make: *** [.deps/zapit] Fehler 2
root@Server:~/dbox#


der Punkt scheint wohl durch folgende Änderungen im CVS zu kommen:

Jan 09
apps/dvb/zapit/src bouquets.cpp getservices.cpp scan.cpp zapit.cpp Ralf Gandy
apps/dvb/zapit/include/zapit bouquets.h channel.h getservices.h types.h Ralf Gandy
cdk/Patches busybox.config Carsten Juttner

hat da jemand ne idee?

lg Xhor :)
XhorRah
Interessierter
Interessierter
Beiträge: 70
Registriert: Donnerstag 1. April 2004, 16:52

Beitrag von XhorRah »

hm... also anscheinend ist da beim einfachen update aus dem cvs ein fehler aufgetreten das diff hat nicht wie sonst die alten zeilen rausgenommen.. komischerweise wohl nur bei der zapit.cpp, genauso waren noch marks wie: " <<<<<< zapit.cpp" usw drin....
komisch....
Kann mir jemand sagen woran das liegt?

lg xhor :)
rasc
Senior Member
Beiträge: 5071
Registriert: Dienstag 18. September 2001, 00:00

Beitrag von rasc »

Du hattest entweder eine lokal modifizierte Version oder eine Zeitmarke war neu fuer die Datei neu gesetzt. Dein Client CVS hat dann wohl eine Kollision in den Aenderungen entdeckt und diese markiert.
XhorRah
Interessierter
Interessierter
Beiträge: 70
Registriert: Donnerstag 1. April 2004, 16:52

Beitrag von XhorRah »

ah danke dir rasc... nur komisch das es bisher auch mit den modifizierten sourcen ging... komisch... naja... wie war das? für alles gibt es ein erstes mal :) *gg*

lg -Xhor :)
essu
Tuxboxer
Tuxboxer
Beiträge: 2452
Registriert: Montag 21. Oktober 2002, 10:04

Beitrag von essu »

XhorRah hat geschrieben:... nur komisch das es bisher auch mit den modifizierten sourcen ging...
So lange es sich mergen lässt geht das, zusätzlicher Code ist eigentlich kein Problem, aber Zeilen, die sich widersprechen können natürlich nicht zusammen übernommen werden. Dann passiert das.
Schon gelesen ???
ENIGMA-DOC