# Authhor: Damyan Ivanov # Description: rename pipe2 symbol to pipe2_kbdl to avoid clashes with the one # declared in system unistd.h # Debian-Bug: 527705 # Upstream-Report: http://www.freelists.org/post/olofsonprojects/kobodeluxe-failing-to-build-in-Debian-enemiesh75-error-const-enemy-kind-pipe2-redeclared-as-different-kind-of-symbol --- a/enemies.h +++ b/enemies.h @@ -72,7 +72,7 @@ extern const enemy_kind bombdeto; extern const enemy_kind cannon; extern const enemy_kind pipe1; extern const enemy_kind core; -extern const enemy_kind pipe2; +extern const enemy_kind pipe2_kbdl; extern const enemy_kind rock; extern const enemy_kind ring; extern const enemy_kind enemy_m1; @@ -430,7 +430,7 @@ inline int _enemy::realize() inline int _enemy::is_pipe() { - return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2))); + return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2_kbdl))); } --- a/enemy.cpp +++ b/enemy.cpp @@ -755,10 +755,10 @@ void _enemy::move_core() void _enemy::kill_core() { - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y)); sound.g_base_core_explo(x, y); release(); @@ -978,19 +978,19 @@ void _enemy::move_pipe2() } p ^= a; if(p & U_MASK) - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); if(p & R_MASK) - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); if(p & D_MASK) - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); if(p & L_MASK) - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); manage.add_score(10); release(); } -const enemy_kind pipe2 = { +const enemy_kind pipe2_kbdl = { 0, &_enemy::make_pipe2, &_enemy::move_pipe2, C44F251EEA9D386100DA80F125E0FD5CE1B0DFEC6D21516EACD#) (p #00D47F185147EC39393CCDA4E7323FFC20FC8B8073E2A54DD63BA392A66975E4204CA48572496A9DFD7522436B852C07472A5AB25B7706F7C14E6F33FBC420FF3B#) (q #00E9AD22F158060BC9AE3601DA623AFC60FFF3058795802CA92371C00097335CF9A23D7782DE353C9DBA93D7BB99E6A24A411107605E722481C5C191F80D7EB77F#) (u #59B45B95AE01A7A7370FAFDB08FE73A4793CE37F228961B09B1B1E7DDAD9F8D3E28F5C5E8B4B067E6B8E0BBF3F690B42991A79E46108DDCDA2514323A66964DE#)))