Fri Nov 16 00:50:40 2012 UTC ()
Fix inline usage.
(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/games/quarry/distinfo
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_board_board-internals.h
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_board_board.c
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_board_board.h
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_gui-gtk_gtk-control-center.c
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_gui-gtk_gtk-control-center.h
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_gui-gtk_quarry-text-buffer.c
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_gui-gtk_quarry-text-buffer.h
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_gui-utils_time-control.c
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_gui-utils_time-control.h
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_sgf_sgf-privates.h
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_sgf_sgf-tree.c
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_sgf_sgf-utils.c
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_sgf_sgf.h
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_utils_string-list.c
diff -r0 -r1.1 pkgsrc/games/quarry/patches/patch-src_utils_utils.h
--- pkgsrc/games/quarry/distinfo 2008/03/13 16:06:16 1.1.1.1
+++ pkgsrc/games/quarry/distinfo 2012/11/16 00:50:39 1.2
| @@ -1,9 +1,24 @@ | | | @@ -1,9 +1,24 @@ |
1 | $NetBSD: distinfo,v 1.1.1.1 2008/03/13 16:06:16 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2012/11/16 00:50:39 joerg Exp $ |
2 | | | 2 | |
3 | SHA1 (quarry-0.2.0.tar.gz) = 261683ed795db8309b2a830badff4d2f1f2cd860 | | 3 | SHA1 (quarry-0.2.0.tar.gz) = 261683ed795db8309b2a830badff4d2f1f2cd860 |
4 | RMD160 (quarry-0.2.0.tar.gz) = d931fa8a228f545c285c5481771bae91fa0787f8 | | 4 | RMD160 (quarry-0.2.0.tar.gz) = d931fa8a228f545c285c5481771bae91fa0787f8 |
5 | Size (quarry-0.2.0.tar.gz) = 1148739 bytes | | 5 | Size (quarry-0.2.0.tar.gz) = 1148739 bytes |
6 | SHA1 (patch-aa) = 4ca3baf50d135572e3fe2905cb7369b54f1d6233 | | 6 | SHA1 (patch-aa) = 4ca3baf50d135572e3fe2905cb7369b54f1d6233 |
7 | SHA1 (patch-ab) = 30214ce85f680b99dccc0009f5bd7ff8f927d9d1 | | 7 | SHA1 (patch-ab) = 30214ce85f680b99dccc0009f5bd7ff8f927d9d1 |
8 | SHA1 (patch-ac) = f37e86ecf9fb0d93fd02c990a3224fffb9ee5c15 | | 8 | SHA1 (patch-ac) = f37e86ecf9fb0d93fd02c990a3224fffb9ee5c15 |
9 | SHA1 (patch-ad) = 07b6eb3a618a26830c74a085cc9e132b413caa52 | | 9 | SHA1 (patch-ad) = 07b6eb3a618a26830c74a085cc9e132b413caa52 |
| | | 10 | SHA1 (patch-src_board_board-internals.h) = 463be30643595776a9dcb2c93efb1cfed07b3b12 |
| | | 11 | SHA1 (patch-src_board_board.c) = a4ca50b94312ec6536dd61fd16cd705923c6402e |
| | | 12 | SHA1 (patch-src_board_board.h) = fb7096efb0131bbeb23bdfc73bcc9192cae391e0 |
| | | 13 | SHA1 (patch-src_gui-gtk_gtk-control-center.c) = a25b63b0fbcf2d5c8133ff58d7ebc2dff7c8dbc5 |
| | | 14 | SHA1 (patch-src_gui-gtk_gtk-control-center.h) = f792f026b4793fee46e748bc6206ff309bc932d9 |
| | | 15 | SHA1 (patch-src_gui-gtk_quarry-text-buffer.c) = efbcdad5857cb61262d92ee6086f4c696601a0ce |
| | | 16 | SHA1 (patch-src_gui-gtk_quarry-text-buffer.h) = 9ec5a88dfbd1fe24d324cbed907ff72de192d70c |
| | | 17 | SHA1 (patch-src_gui-utils_time-control.c) = 2be7ce448f22ce88cbc25025943df3b306bd5e22 |
| | | 18 | SHA1 (patch-src_gui-utils_time-control.h) = 829a5a94f5d57c18373233918e2caafa128c657b |
| | | 19 | SHA1 (patch-src_sgf_sgf-privates.h) = 08f5924924cdf1c4adbc3a23b8ad33af6ee17cf1 |
| | | 20 | SHA1 (patch-src_sgf_sgf-tree.c) = 32e8b26ed58be374a5ba9c83acb959fdc3dbe039 |
| | | 21 | SHA1 (patch-src_sgf_sgf-utils.c) = 1113d0183761d552597e0581808341e1de0ca10f |
| | | 22 | SHA1 (patch-src_sgf_sgf.h) = 1ec4c961ddb14d7c34d12e50f18ba85a8793b5fb |
| | | 23 | SHA1 (patch-src_utils_string-list.c) = 21c48aed6facdb0e9a6da43fbc223e816e76210a |
| | | 24 | SHA1 (patch-src_utils_utils.h) = 93a887aa7973b3a86852b1727610c086cbc3b485 |
$NetBSD: patch-src_board_board-internals.h,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/board/board-internals.h.orig 2012-11-15 15:11:27.000000000 +0000
+++ src/board/board-internals.h
@@ -89,7 +89,7 @@ struct _BoardChangeStackEntry {
};
-inline void board_undo_changes (Board *board, int num_undos);
+void board_undo_changes (Board *board, int num_undos);
int determine_position_delta (int delta_x, int delta_y);
$NetBSD: patch-src_board_board.c,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/board/board.c.orig 2012-11-15 15:11:40.000000000 +0000
+++ src/board/board.c
@@ -281,7 +281,7 @@ board_is_game_over (const Board *board,
/* Determine if a move is legal according to specified rules. */
-inline int
+int
board_is_legal_move (const Board *board, BoardRuleSet rule_set, int color, ...)
{
va_list move;
@@ -300,7 +300,7 @@ board_is_legal_move (const Board *board,
/* Play the specified move on the given board. */
-inline void
+void
board_play_move (Board *board, int color, ...)
{
va_list move;
@@ -388,7 +388,7 @@ board_apply_changes
* tracking unexpectedly changing move number (i.e. with MN[] SGF
* property that doesn't correspond a real move).
*/
-inline void
+void
board_add_dummy_move_entry (Board *board)
{
assert (board);
@@ -409,7 +409,7 @@ board_add_dummy_move_entry (Board *board
* changes. If not moves or changes are in the stack yet, return
* zero.
*/
-inline int
+int
board_undo (Board *board, int num_undos)
{
int k;
@@ -467,7 +467,7 @@ board_get_move_number (const Board *boar
}
-inline void
+void
board_undo_changes (Board *board, int num_changes)
{
int k;
@@ -553,7 +553,7 @@ determine_position_delta (int delta_x, i
/* Dump the contents of given board's grid to stderr. */
-inline void
+void
board_dump (const Board *board)
{
assert (board);
@@ -562,7 +562,7 @@ board_dump (const Board *board)
}
-inline void
+void
board_validate (const Board *board)
{
assert (board);
@@ -1059,7 +1059,7 @@ game_parse_move (Game game, int board_wi
* If the default setup is not empty, nonzero is returned and zero
* otherwise.
*/
-inline int
+int
game_get_default_setup (Game game, int width, int height,
BoardPositionList **black_stones,
BoardPositionList **white_stones)
$NetBSD: patch-src_board_board.h,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/board/board.h.orig 2012-11-15 15:13:35.000000000 +0000
+++ src/board/board.h
@@ -208,24 +208,24 @@ int board_adjust_color_to_play (const B
int board_is_game_over (const Board *board, BoardRuleSet rule_set,
int color_to_play);
-inline int board_is_legal_move (const Board *board, BoardRuleSet rule_set,
+int board_is_legal_move (const Board *board, BoardRuleSet rule_set,
int color, ...);
-inline void board_play_move (Board *board, int color, ...);
+void board_play_move (Board *board, int color, ...);
void board_apply_changes
(Board *board,
const BoardPositionList *const
change_lists[NUM_ON_GRID_VALUES]);
-inline void board_add_dummy_move_entry (Board *board);
+void board_add_dummy_move_entry (Board *board);
-inline int board_undo (Board *board, int num_moves);
+int board_undo (Board *board, int num_moves);
int board_get_move_number (const Board *board,
int num_moves_backward);
-inline void board_dump (const Board *board);
-inline void board_validate (const Board *board);
+void board_dump (const Board *board);
+void board_validate (const Board *board);
BoardPositionList * board_position_list_new (const int *positions,
@@ -299,7 +299,7 @@ int game_parse_move (Game game, int boa
BoardAbstractMoveData *move_data);
-inline int game_get_default_setup (Game game, int width, int height,
+int game_get_default_setup (Game game, int width, int height,
BoardPositionList **black_stones,
BoardPositionList **white_stones);
$NetBSD: patch-src_gui-gtk_gtk-control-center.c,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/gui-gtk/gtk-control-center.c.orig 2012-11-15 15:15:48.000000000 +0000
+++ src/gui-gtk/gtk-control-center.c
@@ -159,7 +159,7 @@ gtk_control_center_present (void)
-inline void
+void
gtk_control_center_window_created (GtkWindow *window)
{
windows = g_slist_prepend (windows, window);
@@ -188,14 +188,14 @@ gtk_control_center_window_destroyed (con
}
-inline void
+void
gtk_control_center_new_reason_to_live (void)
{
num_other_reasons_to_live++;
}
-inline void
+void
gtk_control_center_lost_reason_to_live (void)
{
if (--num_other_reasons_to_live == 0 && windows == NULL)
$NetBSD: patch-src_gui-gtk_gtk-control-center.h,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/gui-gtk/gtk-control-center.h.orig 2012-11-15 15:15:33.000000000 +0000
+++ src/gui-gtk/gtk-control-center.h
@@ -31,11 +31,11 @@
void gtk_control_center_present (void);
-inline void gtk_control_center_window_created (GtkWindow *window);
+void gtk_control_center_window_created (GtkWindow *window);
gint gtk_control_center_window_destroyed (const GtkWindow *window);
-inline void gtk_control_center_new_reason_to_live (void);
-inline void gtk_control_center_lost_reason_to_live (void);
+void gtk_control_center_new_reason_to_live (void);
+void gtk_control_center_lost_reason_to_live (void);
void gtk_control_center_quit (void);
$NetBSD: patch-src_gui-gtk_quarry-text-buffer.c,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/gui-gtk/quarry-text-buffer.c.orig 2012-11-15 15:16:11.000000000 +0000
+++ src/gui-gtk/quarry-text-buffer.c
@@ -983,7 +983,7 @@ quarry_text_buffer_undo_entry_delete (Qu
}
-inline gboolean
+gboolean
quarry_text_buffer_undo_entry_is_empty
(const QuarryTextBufferUndoEntry *undo_entry)
{
$NetBSD: patch-src_gui-gtk_quarry-text-buffer.h,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/gui-gtk/quarry-text-buffer.h.orig 2012-11-15 15:16:07.000000000 +0000
+++ src/gui-gtk/quarry-text-buffer.h
@@ -117,7 +117,7 @@ QuarryTextBufferUndoEntry *
void quarry_text_buffer_undo_entry_delete
(QuarryTextBufferUndoEntry *undo_entry);
-inline gboolean quarry_text_buffer_undo_entry_is_empty
+gboolean quarry_text_buffer_undo_entry_is_empty
(const QuarryTextBufferUndoEntry *undo_entry);
$NetBSD: patch-src_gui-utils_time-control.c,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/gui-utils/time-control.c.orig 2012-11-15 15:19:40.000000000 +0000
+++ src/gui-utils/time-control.c
@@ -95,7 +95,7 @@ time_control_new_from_sgf_node (const Sg
/* Note that this function only duplicates the settings, not the
* state of its argument.
*/
-inline TimeControl *
+TimeControl *
time_control_duplicate (const TimeControl *time_control)
{
return time_control_new (time_control->main_time,
$NetBSD: patch-src_gui-utils_time-control.h,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/gui-utils/time-control.h.orig 2012-11-15 15:19:38.000000000 +0000
+++ src/gui-utils/time-control.h
@@ -55,8 +55,7 @@ struct _TimeControl {
TimeControl * time_control_new (int main_time,
int overtime_length, int moves_per_overtime);
TimeControl * time_control_new_from_sgf_node (const SgfNode *sgf_node);
-inline TimeControl *
- time_control_duplicate (const TimeControl *time_control);
+TimeControl * time_control_duplicate (const TimeControl *time_control);
void time_control_init (TimeControl *time_control,
int main_time,
int overtime_length,
$NetBSD: patch-src_sgf_sgf-privates.h,v 1.1 2012/11/16 00:50:39 joerg Exp $
--- src/sgf/sgf-privates.h.orig 2012-11-15 15:23:14.000000000 +0000
+++ src/sgf/sgf-privates.h
@@ -79,7 +79,7 @@ void sgf_property_free_value (SgfValueT
SgfValue *value);
/* Defined in `sgf-utils.c', but also used from `sgf-undo.c'. */
-inline void sgf_utils_do_switch_to_given_node (SgfGameTree *tree,
+void sgf_utils_do_switch_to_given_node (SgfGameTree *tree,
SgfNode *node);
void sgf_utils_descend_nodes (SgfGameTree *tree, int num_nodes);
void sgf_utils_ascend_nodes (SgfGameTree *tree, int num_nodes);
$NetBSD: patch-src_sgf_sgf-tree.c,v 1.1 2012/11/16 00:50:40 joerg Exp $
--- src/sgf/sgf-tree.c.orig 2012-11-15 15:21:23.000000000 +0000
+++ src/sgf/sgf-tree.c
@@ -1271,7 +1271,7 @@ sgf_node_count_subtree_nodes (const SgfN
/* Dynamically allocate an SgfProperty structure and initialize its
* type and pointer to the next property with given values.
*/
-inline SgfProperty *
+SgfProperty *
sgf_property_new (SgfGameTree *tree, SgfType type, SgfProperty *next)
{
SgfProperty *property = memory_pool_alloc (&tree->property_pool);
@@ -1288,7 +1288,7 @@ sgf_property_new (SgfGameTree *tree, Sgf
* types need to be freed. Values of other types are stored in the
* property structure itself.
*/
-inline void
+void
sgf_property_delete (SgfProperty *property, SgfGameTree *tree)
{
assert (property);
$NetBSD: patch-src_sgf_sgf-utils.c,v 1.1 2012/11/16 00:50:40 joerg Exp $
--- src/sgf/sgf-utils.c.orig 2012-11-15 15:22:55.000000000 +0000
+++ src/sgf/sgf-utils.c
@@ -63,7 +63,7 @@ static int strings_are_equal (const void
const void *second_string);
-inline void
+void
sgf_utils_play_node_move (const SgfNode *node, Board *board)
{
assert (node);
@@ -1717,7 +1717,7 @@ do_enter_tree (SgfGameTree *tree, SgfNod
}
-inline void
+void
sgf_utils_do_switch_to_given_node (SgfGameTree *tree, SgfNode *node)
{
SgfNode *path_scan;
$NetBSD: patch-src_sgf_sgf.h,v 1.1 2012/11/16 00:50:40 joerg Exp $
--- src/sgf/sgf.h.orig 2012-11-15 15:20:43.000000000 +0000
+++ src/sgf/sgf.h
@@ -640,10 +640,9 @@ SgfNode * sgf_node_traverse_backward (c
int sgf_node_count_subtree_nodes (const SgfNode *node);
-inline SgfProperty *
- sgf_property_new (SgfGameTree *tree, SgfType type,
+SgfProperty * sgf_property_new (SgfGameTree *tree, SgfType type,
SgfProperty *next);
-inline void sgf_property_delete (SgfProperty *property,
+void sgf_property_delete (SgfProperty *property,
SgfGameTree *tree);
void sgf_property_delete_at_link (SgfProperty **link,
SgfGameTree *tree);
@@ -813,7 +812,7 @@ typedef enum {
} SgfPasteResult;
-inline void sgf_utils_play_node_move (const SgfNode *node, Board *board);
+void sgf_utils_play_node_move (const SgfNode *node, Board *board);
void sgf_utils_format_node_move (const SgfGameTree *tree,
const SgfNode *node,
StringBuffer *buffer,
$NetBSD: patch-src_utils_string-list.c,v 1.1 2012/11/16 00:50:40 joerg Exp $
--- src/utils/string-list.c.orig 2012-11-15 15:09:31.000000000 +0000
+++ src/utils/string-list.c
@@ -689,7 +689,7 @@ association_list_item_dispose (Associati
}
-inline char *
+char *
association_list_find_association (AssociationList *list, const char *key)
{
AssociationListItem *item = association_list_find (list, key);
$NetBSD: patch-src_utils_utils.h,v 1.1 2012/11/16 00:50:40 joerg Exp $
--- src/utils/utils.h.orig 2012-11-15 15:09:27.000000000 +0000
+++ src/utils/utils.h
@@ -448,7 +448,7 @@ void association_list_item_dispose (Ass
(notch)))
-inline char * association_list_find_association (AssociationList *list,
+char * association_list_find_association (AssociationList *list,
const char *key);