diff -u freeciv-old/common/speclist_c.h freeciv/common/speclist_c.h --- freeciv-old/common/speclist_c.h 2000/05/03 12:51:09 1.2 +++ freeciv/common/speclist_c.h 2000/11/02 09:05:22 @@ -49,9 +49,9 @@ return genlist_size(&tthis->list); } -SPECLIST_TYPE *SPECLIST_FOO(_list_get) (SPECLIST_LIST *tthis, int index) +SPECLIST_TYPE *SPECLIST_FOO(_list_get) (SPECLIST_LIST *tthis, int ind) { - return genlist_get(&tthis->list, index); + return genlist_get(&tthis->list, ind); } void SPECLIST_FOO(_list_insert) (SPECLIST_LIST *tthis, SPECLIST_TYPE *pfoo) diff -u freeciv-old/common/speclist.h freeciv/common/speclist.h --- freeciv-old/common/speclist.h 2000/03/19 04:05:00 1.2 +++ freeciv/common/speclist.h 2000/11/02 09:05:22 @@ -32,7 +32,7 @@ and prototypes for the following functions: void foo_list_init(struct foo_list *This); int foo_list_size(struct foo_list *This); - foo_t *foo_list_get(struct foo_list *This, int index); + foo_t *foo_list_get(struct foo_list *This, int ind); void foo_list_insert(struct foo_list *This, foo_t *pfoo); void foo_list_insert_back(struct foo_list *This, foo_t *pfoo); void foo_list_unlink(struct foo_list *This, foo_t *pfoo); @@ -76,7 +76,7 @@ void SPECLIST_FOO(_list_init) (SPECLIST_LIST *This); int SPECLIST_FOO(_list_size) (SPECLIST_LIST *This); -SPECLIST_TYPE *SPECLIST_FOO(_list_get) (SPECLIST_LIST *This, int index); +SPECLIST_TYPE *SPECLIST_FOO(_list_get) (SPECLIST_LIST *This, int ind); void SPECLIST_FOO(_list_insert) (SPECLIST_LIST *This, SPECLIST_TYPE *pfoo); void SPECLIST_FOO(_list_insert_back) (SPECLIST_LIST *This, SPECLIST_TYPE *pfoo); void SPECLIST_FOO(_list_unlink) (SPECLIST_LIST *This, SPECLIST_TYPE *pfoo); diff -u freeciv-old/common/unittype.h freeciv/common/unittype.h --- freeciv-old/common/unittype.h 2000/09/11 06:40:38 1.3 +++ freeciv/common/unittype.h 2000/11/02 09:05:22 @@ -217,7 +217,7 @@ void role_unit_precalcs(void); int num_role_units(int role); -Unit_Type_id get_role_unit(int role, int index); +Unit_Type_id get_role_unit(int role, int ind); Unit_Type_id best_role_unit(struct city *pcity, int role); #endif /* FC__UNITTYPE_H */ diff -u freeciv-old/common/tech.h freeciv/common/tech.h --- freeciv-old/common/tech.h 2000/05/31 13:35:15 1.19 +++ freeciv/common/tech.h 2000/11/02 09:05:22 @@ -78,7 +78,7 @@ int tech_flag(int tech, int flag); enum tech_flag_id tech_flag_from_str(char *s); -int find_tech_by_flag( int index, int flag ); +int find_tech_by_flag( int ind, int flag ); int tech_turns_to_advance(struct player *pplayer); extern struct advance advances[];