Bug#552885: xbubble: FTBFS: game.c:190: error: declaration of 'round' shadows a global declaration

[Ilya Barygin]

tags 552885 patch
thanks

Some variables just need to be renamed.
https://launchpad.net/ubuntu/+source/xbubble/0.5.11.2-3ubuntu2

only in patch2:
unchanged:
--- xbubble-0.5.11.2.orig/src/xbubble.c
+++ xbubble-0.5.11.2/src/xbubble.c
@@ -116,7 +116,7 @@
 }
 
 static void play_match( enum GameMode mode, int *handicap, enum Level level ) {
-  int round;
+  int round_xb;
   int done;
   int score[2];
   int games[2]  = { 0, 0 };
@@ -132,10 +132,10 @@
     score[0] = 0;
     score[1] = 0;
     done = 0;
-    for ( round = 1; !done; round++ ) {
+    for ( round_xb = 1; !done; round_xb++ ) {
       /* preload bubbles */
       create_randome_level(5);
-      game = new_game( mode, ruleset, colors, round, score, level);
+      game = new_game( mode, ruleset, colors, round_xb, score, level);
       result = play_game(game);
       done = score[1]==2 || score[0]==2 || result == ABORTED;
        //not_done= (!(((score[1]>=5)&&(score[1]-score[0]>1)) || 
only in patch2:
unchanged:
--- xbubble-0.5.11.2.orig/src/game.h
+++ xbubble-0.5.11.2/src/game.h
@@ -23,7 +23,7 @@
 Game new_game( enum GameMode mode,
               RuleSet_t *ruleset,
               int *colors,
-              int round,
+              int round_xb,
               int *score,
               enum Level level );
 
only in patch2:
unchanged:
--- xbubble-0.5.11.2.orig/src/game.c
+++ xbubble-0.5.11.2/src/game.c
@@ -187,7 +187,7 @@
 Game new_game( enum GameMode mode,
               RuleSet_t *ruleset,
               int *colors,
-              int round,
+              int round_xb,
               int *score,
               enum Level level ) {
 
@@ -200,7 +200,7 @@
   game->state = PLAYING;
   game->mode = mode;
   game->score = score;
-  game->round = round;
+  game->round = round_xb;
   for ( i = 0; i < 2; i++ ) {
     game->player_left[i] = 0;
     game->player_right[i] = 0;



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org