Attachment #2052 for bug #2046

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2046
Collapse All | Expand All

Lines 7-13 DLFLAGS = Link Here

(-)a/kpat/freecell-solver/Makefile.lite (-1 / +1 lines)
7	END_OLFLAGS =	7	END_OLFLAGS =
8	END_DLFLAGS =	8	END_DLFLAGS =
9		9
10	INCLUDES = alloc.h app_str.h caas.h card.h cl_chop.h fcs_config.h fcs_cl.h fcs.h fcs_dm.h fcs_enums.h fcs_hash.h fcs_isa.h fcs_move.h fcs_user.h inline.h jhjtypes.h lookup2.h move.h ms_ca.h prefix.h pqueue.h preset.h rand.h state.h test_arr.h tests.h	10	INCLUDES = alloc.h app_str.h caas.h card.h cl_chop.h fcs_config.h fcs_cl.h fcs.h fcs_dm.h fcs_enums.h fcs_hash.h fcs_isa.h fcs_move.h fcs_user.h jhjtypes.h lookup2.h move.h ms_ca.h prefix.h pqueue.h preset.h rand.h state.h test_arr.h tests.h
11		11
12	TARGETS = fc-solve	12	TARGETS = fc-solve
13		13

Lines 285-291 Link Here

(-)a/kpat/freecell-solver/caas.c (-2 / +2 lines)
285	#endif	285	#endif
286		286
287	#ifdef INDIRECT_STACK_STATES	287	#ifdef INDIRECT_STACK_STATES
288	static GCC_INLINE void freecell_solver_cache_stacks(	288	static inline void freecell_solver_cache_stacks(
289	freecell_solver_hard_thread_t * hard_thread,	289	freecell_solver_hard_thread_t * hard_thread,
290	fcs_state_with_locations_t * new_state	290	fcs_state_with_locations_t * new_state
291	)	291	)
Lines 498-504 guint freecell_solver_hash_function(gconstpointer key) Link Here
498	*	498	*
499	* */	499	* */
500		500
501	GCC_INLINE int freecell_solver_check_and_add_state(	501	inline int freecell_solver_check_and_add_state(
502	freecell_solver_soft_thread_t * soft_thread,	502	freecell_solver_soft_thread_t * soft_thread,
503	fcs_state_with_locations_t * new_state,	503	fcs_state_with_locations_t * new_state,
504	fcs_state_with_locations_t * * existing_state	504	fcs_state_with_locations_t * * existing_state




/*
 * inline.h - the purpose of this file is to define the GCC_INLINE
 * macro.
 *
 * Written by Shlomi Fish, 2002
 *
 * This file is in the public domain (it's uncopyrighted).
 * */

#ifndef FC_SOLVE__INLINE_H
#define FC_SOLVE__INLINE_H

#if defined(__GNUC__)
#define GCC_INLINE __inline__
#else
#define GCC_INLINE 
#endif


#endif

Lines 16-23 Link Here

(-)a/kpat/freecell-solver/move.c (-3 / +1 lines)
16	#include "dmalloc.h"	16	#include "dmalloc.h"
17	#endif	17	#endif
18		18
19	#include "inline.h"
20
21	#if 0	19	#if 0
22	/* This variable was used for debugging. */	20	/* This variable was used for debugging. */
23	int msc_counter=0;	21	int msc_counter=0;
Lines 369-375 void freecell_solver_move_stack_normalize( Link Here
369	freecell_solver_move_stack_swallow_stack(moves, temp_moves);	367	freecell_solver_move_stack_swallow_stack(moves, temp_moves);
370	}	368	}
371		369
372	GCC_INLINE int convert_freecell_num(int fcn)	370	static inline int convert_freecell_num(int fcn)
373	{	371	{
374	if (fcn >= 7)	372	if (fcn >= 7)
375	return (fcn+3);	373	return (fcn+3);

Lines 7-15 Link Here

(-)a/kpat/freecell-solver/ms_ca.h (-3 / +1 lines)
7	* This file is in the public domain (it's uncopyrighted).	7	* This file is in the public domain (it's uncopyrighted).
8	* */	8	* */
9		9
10	#include "inline.h"	10	static inline fcs_move_stack_t * freecell_solver_move_stack_compact_allocate(freecell_solver_hard_thread_t * hard_thread, fcs_move_stack_t * old_move_stack_to_parent)
11
12	static GCC_INLINE fcs_move_stack_t * freecell_solver_move_stack_compact_allocate(freecell_solver_hard_thread_t * hard_thread, fcs_move_stack_t * old_move_stack_to_parent)
13	{	11	{
14	char * ptr;	12	char * ptr;
15	fcs_move_stack_t * new_move_stack_to_parent;	13	fcs_move_stack_t * new_move_stack_to_parent;




extern "C" {
#endif

#include "inline.h"

struct fcs_rand_struct
{
    unsigned long seed;


extern void freecell_solver_rand_srand(fcs_rand_t * rand, unsigned int seed);

static inline int freecell_solver_rand_rand15(fcs_rand_t * rand)
{
    rand->seed = (rand->seed * 214013 + 2531011);
    return (rand->seed >> 16) & 0x7fff;

 * 15-bit ones.
 *
 * */
static inline int freecell_solver_rand_get_random_number(fcs_rand_t * rand)
{
    int one, two;
    one = freecell_solver_rand_rand15(rand);

Return to bug 2046

Lines 1-20 Link Here

(-)a/kpat/freecell-solver/inline.h (-20 lines)
1	/*
2	* inline.h - the purpose of this file is to define the GCC_INLINE
3	* macro.
4	*
5	* Written by Shlomi Fish, 2002
6	*
7	* This file is in the public domain (it's uncopyrighted).
8	* */
9
10	#ifndef FC_SOLVE__INLINE_H
11	#define FC_SOLVE__INLINE_H
12
13	#if defined(__GNUC__)
14	#define GCC_INLINE __inline__
15	#else
16	#define GCC_INLINE
17	#endif
18
19
20	#endif

Lines 6-13 Link Here

(-)a/kpat/freecell-solver/rand.h (-4 / +2 lines)
6	extern "C" {	6	extern "C" {
7	#endif	7	#endif
8		8
9	#include "inline.h"
10
11	struct fcs_rand_struct	9	struct fcs_rand_struct
12	{	10	{
13	unsigned long seed;	11	unsigned long seed;
Lines 20-26 extern void freecell_solver_rand_free(fcs_rand_t * rand); Link Here
20		18
21	extern void freecell_solver_rand_srand(fcs_rand_t * rand, unsigned int seed);	19	extern void freecell_solver_rand_srand(fcs_rand_t * rand, unsigned int seed);
22		20
23	static GCC_INLINE int freecell_solver_rand_rand15(fcs_rand_t * rand)	21	static inline int freecell_solver_rand_rand15(fcs_rand_t * rand)
24	{	22	{
25	rand->seed = (rand->seed * 214013 + 2531011);	23	rand->seed = (rand->seed * 214013 + 2531011);
26	return (rand->seed >> 16) & 0x7fff;	24	return (rand->seed >> 16) & 0x7fff;
Lines 32-38 static GCC_INLINE int freecell_solver_rand_rand15(fcs_rand_t * rand) Link Here
32	* 15-bit ones.	30	* 15-bit ones.
33	*	31	*
34	* */	32	* */
35	static GCC_INLINE int freecell_solver_rand_get_random_number(fcs_rand_t * rand)	33	static inline int freecell_solver_rand_get_random_number(fcs_rand_t * rand)
36	{	34	{
37	int one, two;	35	int one, two;
38	one = freecell_solver_rand_rand15(rand);	36	one = freecell_solver_rand_rand15(rand);