[Heroes] heroes m4/gccwarn.m4 src/generic_list.h src/her...

[Alexandre Duret-Lutz]

CVSROOT:        /cvsroot/heroes
Module name:    heroes
Changes by:     Alexandre Duret-Lutz <address@hidden>   02/11/22 15:47:24

Modified files:
        m4             : gccwarn.m4 
        src            : generic_list.h heroes.h persona.h 

Log message:
        * m4/gccwarn.m4 (CF_GCC_WARNINGS): Add -Wredundant-decls.
        * src/generic_list.h (NEW_LIST_BODY): Make the dummy function
        that eat the simicolon unique.
        * src/heroes.h (bonus_anim_htimer): Don't declare (already in bonus.h).
        (corner_htimer): Declare only once.
        (compute_corner): Don't declare (already in camera.h).
        * src/persona.h (keep_sgid, keep_suid): Mark as extern.

Patches:
Index: heroes/m4/gccwarn.m4
diff -u heroes/m4/gccwarn.m4:1.5 heroes/m4/gccwarn.m4:1.6
--- heroes/m4/gccwarn.m4:1.5    Fri Dec  7 17:12:28 2001
+++ heroes/m4/gccwarn.m4        Fri Nov 22 15:47:24 2002
@@ -36,7 +36,8 @@
    Winline \
    Wnested-externs \
    Wpointer-arith \
-   Wwrite-strings
+   Wwrite-strings \
+   Wredundant-decls
   do
     CFLAGS="$cf_save_CFLAGS $ac_cv_prog_gcc_warn_flags -$cf_opt"
     if AC_TRY_EVAL(ac_compile); then
Index: heroes/src/generic_list.h
diff -u heroes/src/generic_list.h:1.8 heroes/src/generic_list.h:1.9
--- heroes/src/generic_list.h:1.8       Sun Feb 24 17:07:55 2002
+++ heroes/src/generic_list.h   Fri Nov 22 15:47:24 2002
@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------------.
-| Copyright 2000  Alexandre Duret-Lutz <address@hidden>                 |
+| Copyright 2000, 2002  Alexandre Duret-Lutz <address@hidden>           |
 |                                                                         |
 | This file is part of Heroes.                                            |
 |                                                                         |
@@ -131,7 +131,7 @@
   }                                                                    \
 }                                                                      \
                                                                        \
-extern void dummy_function_declaration_to_eat_ending_semicolon (void)
+extern void PREFIX##_dummy_function_declaration_to_eat_ending_semicolon (void)
 
 #define NEW_LIST(PREFIX,TYPE,EQUAL_P,DESTRUCTOR)       \
 NEW_LIST_SPEC(PREFIX,TYPE);                            \
Index: heroes/src/heroes.h
diff -u heroes/src/heroes.h:1.15 heroes/src/heroes.h:1.16
--- heroes/src/heroes.h:1.15    Tue Feb 12 16:50:41 2002
+++ heroes/src/heroes.h Fri Nov 22 15:47:24 2002
@@ -1,5 +1,6 @@
 /*------------------------------------------------------------------------.
-| Copyright 1997, 1998, 2000  Alexandre Duret-Lutz <address@hidden>     |
+| Copyright 1997, 1998, 2000, 2002                                        |
+|                                Alexandre Duret-Lutz <address@hidden>  |
 |                                                                         |
 | This file is part of Heroes.                                            |
 |                                                                         |
@@ -25,18 +26,15 @@
 
 extern a_timer clock_htimer;
 extern a_timer blink_htimer;
-extern a_timer bonus_anim_htimer;
 extern a_timer tiles_anim_htimer;
 extern a_timer corner_htimer;
 extern a_timer waving_htimer;
 extern a_timer background_htimer;
-extern a_timer corner_htimer;
 extern a_timer demo_trigger_htimer;
 extern a_timer sound_track_htimer;
 extern long event_time;
 extern a_timer event_htimer;
 
-extern void compute_corner (int p, int n);
 extern void play_demo (void);
 
 extern char enable_blit;
Index: heroes/src/persona.h
diff -u heroes/src/persona.h:1.4 heroes/src/persona.h:1.5
--- heroes/src/persona.h:1.4    Fri Sep 21 06:43:54 2001
+++ heroes/src/persona.h        Fri Nov 22 15:47:24 2002
@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------.
-| Copyright 2001  Alexandre Duret-Lutz <address@hidden>           |
+| Copyright 2001, 2002  Alexandre Duret-Lutz <address@hidden>     |
 |                                                                   |
 | This file is part of Heroes.                                      |
 |                                                                   |
@@ -28,8 +28,8 @@
  * difference only if the program has a sgid or suid bit.
  */
 
-bool keep_sgid;                        /* Whether we should keep the  */
-bool keep_suid;                        /* SGID or SUID priviledge. */
+extern bool keep_sgid;                 /* Whether we should keep the  */
+extern bool keep_suid;                 /* SGID or SUID priviledge. */
 
 /* Get information about the current persona,
    and switch to the user persona.  */