# 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, msg=1'>Expand)Author 2019-01-20tests: More adjustments to python.scm split....Efraim Flashner 2019-01-10guix: lint: Warn only if GitHub URI is not same as the package URI....Arun Isaac 2018-12-27lint: Check for unstable tarballs....Efraim Flashner 2018-12-24guix: lint: Check for source URIs redirecting to GitHub....Arun Isaac 2018-11-20lint: 'check-derivation' tries all the package's supported systems....Ludovic Courtès 2017-12-10lint: 'check-vulnerabilities' also checks package properties....Efraim Flashner 2017-11-28lint: 'patch-file-names' checks for file name length....Ludovic Courtès 2017-10-12lint: 'home-page' checker reports permanent redirects....Ludovic Courtès 2017-10-12tests: Support multiple HTTP server instances....Ludovic Courtès 2017-03-27ui: Support Texinfo markup in package synopses....Alex Kost 2016-11-25Merge branch 'master' into python-build-systemLeo Famulari 2016-11-19lint: Add 'mirror-url' checker....Ludovic Courtès 2016-11-16tests: Move HTTP server to (guix tests http)....Ludovic Courtès 2016-11-15guix: Add lint-checker for packages which should be no inputs at all....Hartmut Goebel 2016-10-19lint: Suggest @code instead of quotes....Ludovic Courtès 2016-10-03lint: 'cve' checker reports the replacement's vulnerabilities....Ludovic Courtès 2016-08-28guix: lint: Check descriptions for trademark signs....Eric Bavier