[Freeciv-Dev] Re: (PR#8656) inline the speclists
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
To: |
undisclosed-recipients: ; |
|
Subject: |
[Freeciv-Dev] Re: (PR#8656) inline the speclists |
|
From: |
"Per Inge Mathisen" <per@xxxxxxxxxxx> |
|
Date: |
Wed, 5 May 2004 01:52:39 -0700 |
|
Reply-to: |
rt@xxxxxxxxxxx |
<URL: http://rt.freeciv.org/Ticket/Display.html?id=8656 >
On Tue, 4 May 2004, Jason Short wrote:
> > This patch makes speclists inline (yes, which I thought impossible until
> > recently).
> >
> > It removes 130 lines and adds 57. Removes one file (speclist_c.h). Makes
> > code more readable and understandable. And a tiny bit faster.
>
> The patch no longer applies cleanly.
Err, but it does.
Anyway, new patch attached. Removes SPECLIST_FUNC, as requested, and
updates speclists for all clients.
- Per
Index: client/clinet.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/clinet.c,v
retrieving revision 1.96
diff -u -r1.96 clinet.c
--- client/clinet.c 13 Apr 2004 16:40:00 -0000 1.96
+++ client/clinet.c 5 May 2004 08:50:42 -0000
@@ -480,10 +480,6 @@
#endif
-#define SPECLIST_TAG server
-#define SPECLIST_TYPE struct server
-#include "speclist_c.h"
-
/**************************************************************************
Create the list of servers from the metaserver
The result must be free'd with delete_server_list() when no
Index: client/helpdata.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/helpdata.c,v
retrieving revision 1.68
diff -u -r1.68 helpdata.c
--- client/helpdata.c 1 Dec 2003 18:03:40 -0000 1.68
+++ client/helpdata.c 5 May 2004 08:50:43 -0000
@@ -50,9 +50,6 @@
#define SPECLIST_TAG help
#define SPECLIST_TYPE struct help_item
#include "speclist.h"
-#define SPECLIST_TAG help
-#define SPECLIST_TYPE struct help_item
-#include "speclist_c.h"
#define help_list_iterate(helplist, phelp) \
TYPED_LIST_ITERATE(struct help_item, helplist, phelp)
Index: client/tilespec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v
retrieving revision 1.166
diff -u -r1.166 tilespec.c
--- client/tilespec.c 4 May 2004 18:22:02 -0000 1.166
+++ client/tilespec.c 5 May 2004 08:50:44 -0000
@@ -110,10 +110,6 @@
#define SPECLIST_TYPE struct specfile
#include "speclist.h"
-#define SPECLIST_TAG specfile
-#define SPECLIST_TYPE struct specfile
-#include "speclist_c.h"
-
#define specfile_list_iterate(list, pitem) \
TYPED_LIST_ITERATE(struct specfile, list, pitem)
#define specfile_list_iterate_end LIST_ITERATE_END
@@ -123,10 +119,6 @@
#define SPECLIST_TYPE struct small_sprite
#include "speclist.h"
-#define SPECLIST_TAG small_sprite
-#define SPECLIST_TYPE struct small_sprite
-#include "speclist_c.h"
-
#define small_sprite_list_iterate(list, pitem) \
TYPED_LIST_ITERATE(struct small_sprite, list, pitem)
#define small_sprite_list_iterate_end LIST_ITERATE_END
Index: client/agents/agents.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/agents/agents.c,v
retrieving revision 1.28
diff -u -r1.28 agents.c
--- client/agents/agents.c 18 Apr 2004 10:01:04 -0000 1.28
+++ client/agents/agents.c 5 May 2004 08:50:45 -0000
@@ -59,10 +59,6 @@
#define SPECLIST_TYPE struct call
#include "speclist.h"
-#define SPECLIST_TAG call
-#define SPECLIST_TYPE struct call
-#include "speclist_c.h"
-
#define call_list_iterate(calllist, pcall) \
TYPED_LIST_ITERATE(struct call, calllist, pcall)
#define call_list_iterate_end LIST_ITERATE_END
Index: client/agents/cma_fec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/agents/cma_fec.c,v
retrieving revision 1.18
diff -u -r1.18 cma_fec.c
--- client/agents/cma_fec.c 25 Feb 2004 20:09:50 -0000 1.18
+++ client/agents/cma_fec.c 5 May 2004 08:50:45 -0000
@@ -47,10 +47,6 @@
#define SPECLIST_TYPE struct cma_preset
#include "speclist.h"
-#define SPECLIST_TAG preset
-#define SPECLIST_TYPE struct cma_preset
-#include "speclist_c.h"
-
#define preset_list_iterate(presetlist, ppreset) \
TYPED_LIST_ITERATE(struct cma_preset, presetlist, ppreset)
#define preset_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk-2.0/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/citydlg.c,v
retrieving revision 1.84
diff -u -r1.84 citydlg.c
--- client/gui-gtk-2.0/citydlg.c 2 May 2004 08:00:50 -0000 1.84
+++ client/gui-gtk-2.0/citydlg.c 5 May 2004 08:50:47 -0000
@@ -64,14 +64,8 @@
/* get 'struct dialog_list' and related function */
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct city_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct city_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct city_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk-2.0/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/cma_fe.c,v
retrieving revision 1.16
diff -u -r1.16 cma_fe.c
--- client/gui-gtk-2.0/cma_fe.c 1 May 2004 17:28:47 -0000 1.16
+++ client/gui-gtk-2.0/cma_fe.c 5 May 2004 08:50:47 -0000
@@ -42,14 +42,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct cma_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct cma_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct cma_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk-2.0/diplodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/diplodlg.c,v
retrieving revision 1.20
diff -u -r1.20 diplodlg.c
--- client/gui-gtk-2.0/diplodlg.c 1 May 2004 17:28:47 -0000 1.20
+++ client/gui-gtk-2.0/diplodlg.c 5 May 2004 08:50:48 -0000
@@ -59,14 +59,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct Diplomacy_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk-2.0/happiness.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/happiness.c,v
retrieving revision 1.11
diff -u -r1.11 happiness.c
--- client/gui-gtk-2.0/happiness.c 11 May 2003 22:41:41 -0000 1.11
+++ client/gui-gtk-2.0/happiness.c 5 May 2004 08:50:48 -0000
@@ -52,14 +52,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct happiness_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct happiness_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct happiness_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk-2.0/spaceshipdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/spaceshipdlg.c,v
retrieving revision 1.11
diff -u -r1.11 spaceshipdlg.c
--- client/gui-gtk-2.0/spaceshipdlg.c 1 May 2004 17:28:47 -0000 1.11
+++ client/gui-gtk-2.0/spaceshipdlg.c 5 May 2004 08:50:48 -0000
@@ -60,14 +60,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct spaceship_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: common/city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.206
diff -u -r1.206 city.c
--- common/city.c 22 Apr 2004 22:58:28 -0000 1.206
+++ common/city.c 5 May 2004 08:50:50 -0000
@@ -29,11 +29,6 @@
#include "city.h"
-/* get 'struct city_list' functions: */
-#define SPECLIST_TAG city
-#define SPECLIST_TYPE struct city
-#include "speclist_c.h"
-
/* start helper functions for generic_city_refresh */
static int content_citizens(struct player *pplayer);
static void set_tax_income(struct city *pcity);
Index: common/connection.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/connection.c,v
retrieving revision 1.37
diff -u -r1.37 connection.c
--- common/connection.c 14 Jan 2004 11:58:12 -0000 1.37
+++ common/connection.c 5 May 2004 08:50:50 -0000
@@ -43,11 +43,6 @@
#include "connection.h"
-/* get 'struct conn_list' functions: */
-#define SPECLIST_TAG conn
-#define SPECLIST_TYPE struct connection
-#include "speclist_c.h"
-
/* String used for connection.addr and related cases to indicate
* blank/unknown/not-applicable address:
*/
Index: common/diptreaty.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/diptreaty.c,v
retrieving revision 1.19
diff -u -r1.19 diptreaty.c
--- common/diptreaty.c 4 Nov 2003 10:21:56 -0000 1.19
+++ common/diptreaty.c 5 May 2004 08:50:50 -0000
@@ -25,10 +25,6 @@
#include "diptreaty.h"
-#define SPECLIST_TAG clause
-#define SPECLIST_TYPE struct Clause
-#include "speclist_c.h"
-
/**************************************************************************
Returns TRUE iff pplayer could do diplomancy in the game at all.
**************************************************************************/
Index: common/unit.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/unit.c,v
retrieving revision 1.207
diff -u -r1.207 unit.c
--- common/unit.c 4 May 2004 17:40:26 -0000 1.207
+++ common/unit.c 5 May 2004 08:50:51 -0000
@@ -30,11 +30,6 @@
#include "unit.h"
-/* get 'struct unit_list' functions: */
-#define SPECLIST_TAG unit
-#define SPECLIST_TYPE struct unit
-#include "speclist_c.h"
-
/***************************************************************
This function calculates the move rate of the unit taking into
account the penalty for reduced hitpoints (affects sea and land
Index: server/sernet.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/sernet.c,v
retrieving revision 1.117
diff -u -r1.117 sernet.c
--- server/sernet.c 2 May 2004 08:00:50 -0000 1.117
+++ server/sernet.c 5 May 2004 08:50:52 -0000
@@ -113,10 +113,6 @@
#define SPECLIST_TYPE struct timer
#include "speclist.h"
-#define SPECLIST_TAG timer
-#define SPECLIST_TYPE struct timer
-#include "speclist_c.h"
-
#define PROCESSING_TIME_STATISTICS 0
static int server_accept_connection(int sockfd);
Index: server/diplhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/diplhand.c,v
retrieving revision 1.80
diff -u -r1.80 diplhand.c
--- server/diplhand.c 6 Mar 2004 11:13:05 -0000 1.80
+++ server/diplhand.c 5 May 2004 08:50:52 -0000
@@ -45,10 +45,6 @@
#define SPECLIST_TYPE struct Treaty
#include "speclist.h"
-#define SPECLIST_TAG treaty
-#define SPECLIST_TYPE struct Treaty
-#include "speclist_c.h"
-
#define treaty_list_iterate(list, p) \
TYPED_LIST_ITERATE(struct Treaty, list, p)
#define treaty_list_iterate_end LIST_ITERATE_END
Index: utility/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- utility/Makefile.am 2 May 2004 12:41:53 -0000 1.1
+++ utility/Makefile.am 5 May 2004 08:50:52 -0000
@@ -38,7 +38,6 @@
shared.c \
shared.h \
speclist.h \
- speclist_c.h \
specvec.h \
specvec_c.h \
support.c \
Index: utility/registry.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/registry.c,v
retrieving revision 1.61
diff -u -r1.61 registry.c
--- utility/registry.c 16 Apr 2004 17:08:27 -0000 1.61
+++ utility/registry.c 5 May 2004 08:50:53 -0000
@@ -186,8 +186,6 @@
/* create a 'struct entry_list' and related functions: */
#define SPECLIST_TAG entry
#include "speclist.h"
-#define SPECLIST_TAG entry
-#include "speclist_c.h"
#define entry_list_iterate(entlist, pentry) \
TYPED_LIST_ITERATE(struct entry, entlist, pentry)
@@ -202,8 +200,6 @@
/* create a 'struct section_list' and related functions: */
#define SPECLIST_TAG section
#include "speclist.h"
-#define SPECLIST_TAG section
-#include "speclist_c.h"
#define section_list_iterate(seclist, psection) \
TYPED_LIST_ITERATE(struct section, seclist, psection)
Index: utility/speclist.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/speclist.h,v
retrieving revision 1.5
diff -u -r1.5 speclist.h
--- utility/speclist.h 15 Nov 2002 21:24:30 -0000 1.5
+++ utility/speclist.h 5 May 2004 08:50:53 -0000
@@ -46,15 +46,6 @@
TYPED_LIST_ITERATE(foo_t, foolist, pfoo)
#define foo_list_iterate_end LIST_ITERATE_END
- If you define SPECLIST_STATIC only the functions foo_list_init,
- foo_list_size, foo_list_get, foo_list_insert and foo_list_unlink
- are provided. But these functions will be provided as static
- functions.
-
- If you define SPECLIST_STATIC1 only the functions foo_list_init,
- foo_list_insert and foo_list_unlink are provided. But these
- functions will be provided as static functions.
-
Also, in a single .c file, you should include speclist_c.h,
with the same SPECLIST_TAG and SPECLIST_TYPE defined, to
provide the function implementations.
@@ -75,37 +66,55 @@
#define SPECLIST_TYPE struct SPECLIST_TAG
#endif
-#if defined (SPECLIST_STATIC) || defined (SPECLIST_STATIC1)
-#define SPECLIST_FUNC static
-#else
-#define SPECLIST_FUNC
-#endif
-
#define SPECLIST_PASTE_(x,y) x ## y
#define SPECLIST_PASTE(x,y) SPECLIST_PASTE_(x,y)
#define SPECLIST_LIST struct SPECLIST_PASTE(SPECLIST_TAG, _list)
-
#define SPECLIST_FOO(suffix) SPECLIST_PASTE(SPECLIST_TAG, suffix)
SPECLIST_LIST {
struct genlist list;
};
-SPECLIST_FUNC void SPECLIST_FOO(_list_init) (SPECLIST_LIST *tthis);
-SPECLIST_FUNC void SPECLIST_FOO(_list_insert) (SPECLIST_LIST *tthis,
SPECLIST_TYPE *pfoo);
-SPECLIST_FUNC void SPECLIST_FOO(_list_unlink) (SPECLIST_LIST *tthis,
SPECLIST_TYPE *pfoo);
-
-#if !defined (SPECLIST_STATIC1)
-SPECLIST_FUNC int SPECLIST_FOO(_list_size) (SPECLIST_LIST *tthis);
-SPECLIST_FUNC SPECLIST_TYPE *SPECLIST_FOO(_list_get) (SPECLIST_LIST *tthis,
int index);
-#endif
-
-#if !defined (SPECLIST_STATIC) && !defined (SPECLIST_STATIC1)
-SPECLIST_FUNC void SPECLIST_FOO(_list_insert_back) (SPECLIST_LIST *tthis,
SPECLIST_TYPE *pfoo);
-SPECLIST_FUNC void SPECLIST_FOO(_list_unlink_all) (SPECLIST_LIST *tthis);
-SPECLIST_FUNC void SPECLIST_FOO(_list_sort) (SPECLIST_LIST *tthis, int
(*compar)(const void *, const void *));
-#endif
+static inline void SPECLIST_FOO(_list_init) (SPECLIST_LIST *tthis)
+{
+ genlist_init(&tthis->list);
+}
+
+static inline void SPECLIST_FOO(_list_insert) (SPECLIST_LIST *tthis,
SPECLIST_TYPE *pfoo)
+{
+ genlist_insert(&tthis->list, pfoo, 0);
+}
+
+static inline void SPECLIST_FOO(_list_unlink) (SPECLIST_LIST *tthis,
SPECLIST_TYPE *pfoo)
+{
+ genlist_unlink(&tthis->list, pfoo);
+}
+
+static inline int SPECLIST_FOO(_list_size) (SPECLIST_LIST *tthis)
+{
+ return genlist_size(&tthis->list);
+}
+
+static inline SPECLIST_TYPE *SPECLIST_FOO(_list_get) (SPECLIST_LIST *tthis,
int index)
+{
+ return (SPECLIST_TYPE *)genlist_get(&tthis->list, index);
+}
+
+static inline void SPECLIST_FOO(_list_insert_back) (SPECLIST_LIST *tthis,
SPECLIST_TYPE *pfoo)
+{
+ genlist_insert(&tthis->list, pfoo, -1);
+}
+
+static inline void SPECLIST_FOO(_list_unlink_all) (SPECLIST_LIST *tthis)
+{
+ genlist_unlink_all(&tthis->list);
+}
+
+static inline void SPECLIST_FOO(_list_sort) (SPECLIST_LIST * tthis, int
(*compar) (const void *, const void *))
+{
+ genlist_sort(&tthis->list, compar);
+}
#undef SPECLIST_TAG
#undef SPECLIST_TYPE
@@ -113,6 +122,3 @@
#undef SPECLIST_PASTE
#undef SPECLIST_LIST
#undef SPECLIST_FOO
-#undef SPECLIST_FUNC
-#undef SPECLIST_STATIC
-#undef SPECLIST_STATIC1
Index: client/gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.182
diff -u -r1.182 citydlg.c
--- client/gui-gtk/citydlg.c 23 Apr 2004 22:58:05 -0000 1.182
+++ client/gui-gtk/citydlg.c 5 May 2004 08:50:56 -0000
@@ -66,14 +66,8 @@
/* get 'struct dialog_list' and related functions: */
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct city_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct city_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct city_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cma_fe.c,v
retrieving revision 1.20
diff -u -r1.20 cma_fe.c
--- client/gui-gtk/cma_fe.c 14 Feb 2004 02:12:52 -0000 1.20
+++ client/gui-gtk/cma_fe.c 5 May 2004 08:50:56 -0000
@@ -42,14 +42,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct cma_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct cma_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct cma_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk/diplodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/diplodlg.c,v
retrieving revision 1.42
diff -u -r1.42 diplodlg.c
--- client/gui-gtk/diplodlg.c 31 Jan 2004 17:52:40 -0000 1.42
+++ client/gui-gtk/diplodlg.c 5 May 2004 08:50:57 -0000
@@ -81,14 +81,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct Diplomacy_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-gtk/spaceshipdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/spaceshipdlg.c,v
retrieving revision 1.24
diff -u -r1.24 spaceshipdlg.c
--- client/gui-gtk/spaceshipdlg.c 23 Apr 2004 22:58:05 -0000 1.24
+++ client/gui-gtk/spaceshipdlg.c 5 May 2004 08:50:57 -0000
@@ -61,14 +61,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct spaceship_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-mui/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/citydlg.c,v
retrieving revision 1.74
diff -u -r1.74 citydlg.c
--- client/gui-mui/citydlg.c 25 Feb 2004 20:09:51 -0000 1.74
+++ client/gui-mui/citydlg.c 5 May 2004 08:50:58 -0000
@@ -68,10 +68,6 @@
#define SPECLIST_TYPE struct city_dialog
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct city_dialog
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct city_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-mui/diplodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/diplodlg.c,v
retrieving revision 1.16
diff -u -r1.16 diplodlg.c
--- client/gui-mui/diplodlg.c 26 Jun 2003 23:03:12 -0000 1.16
+++ client/gui-mui/diplodlg.c 5 May 2004 08:50:59 -0000
@@ -75,14 +75,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct Diplomacy_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-mui/spaceshipdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/spaceshipdlg.c,v
retrieving revision 1.15
diff -u -r1.15 spaceshipdlg.c
--- client/gui-mui/spaceshipdlg.c 15 Nov 2002 21:24:29 -0000 1.15
+++ client/gui-mui/spaceshipdlg.c 5 May 2004 08:50:59 -0000
@@ -65,14 +65,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct spaceship_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-win32/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/cma_fe.c,v
retrieving revision 1.1
diff -u -r1.1 cma_fe.c
--- client/gui-win32/cma_fe.c 3 Apr 2004 21:29:54 -0000 1.1
+++ client/gui-win32/cma_fe.c 5 May 2004 08:50:59 -0000
@@ -40,15 +40,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct cma_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct cma_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
-
struct cma_dialog {
struct city *pcity;
HWND mainwin;
Index: client/gui-win32/diplodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/diplodlg.c,v
retrieving revision 1.16
diff -u -r1.16 diplodlg.c
--- client/gui-win32/diplodlg.c 8 Mar 2004 02:17:20 -0000 1.16
+++ client/gui-win32/diplodlg.c 5 May 2004 08:51:00 -0000
@@ -84,14 +84,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct Diplomacy_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-win32/spaceshipdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/spaceshipdlg.c,v
retrieving revision 1.10
diff -u -r1.10 spaceshipdlg.c
--- client/gui-win32/spaceshipdlg.c 6 Dec 2003 23:14:34 -0000 1.10
+++ client/gui-win32/spaceshipdlg.c 5 May 2004 08:51:00 -0000
@@ -55,14 +55,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct spaceship_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-xaw/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/citydlg.c,v
retrieving revision 1.114
diff -u -r1.114 citydlg.c
--- client/gui-xaw/citydlg.c 23 Apr 2004 22:58:06 -0000 1.114
+++ client/gui-xaw/citydlg.c 5 May 2004 08:51:01 -0000
@@ -134,14 +134,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct city_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct city_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct city_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-xaw/diplodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/diplodlg.c,v
retrieving revision 1.37
diff -u -r1.37 diplodlg.c
--- client/gui-xaw/diplodlg.c 28 Nov 2003 17:37:20 -0000 1.37
+++ client/gui-xaw/diplodlg.c 5 May 2004 08:51:02 -0000
@@ -101,14 +101,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct Diplomacy_dialog
-#define SPECLIST_STATIC
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct Diplomacy_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
Index: client/gui-xaw/spaceshipdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/spaceshipdlg.c,v
retrieving revision 1.22
diff -u -r1.22 spaceshipdlg.c
--- client/gui-xaw/spaceshipdlg.c 23 Apr 2004 22:58:06 -0000 1.22
+++ client/gui-xaw/spaceshipdlg.c 5 May 2004 08:51:02 -0000
@@ -72,14 +72,8 @@
#define SPECLIST_TAG dialog
#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
#include "speclist.h"
-#define SPECLIST_TAG dialog
-#define SPECLIST_TYPE struct spaceship_dialog
-#define SPECLIST_STATIC1
-#include "speclist_c.h"
-
#define dialog_list_iterate(dialoglist, pdialog) \
TYPED_LIST_ITERATE(struct spaceship_dialog, dialoglist, pdialog)
#define dialog_list_iterate_end LIST_ITERATE_END
|
|
