Fixed FTBFS on Slackware. This resolves bug 2046.

pull/1/head
Michele Calgaro 11 years ago
parent 8c0324af15
commit c1a1b2a176

@ -7,7 +7,7 @@ DLFLAGS =
END_OLFLAGS =
END_DLFLAGS =
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
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
TARGETS = fc-solve

@ -285,7 +285,7 @@
#endif
#ifdef INDIRECT_STACK_STATES
static GCC_INLINE void freecell_solver_cache_stacks(
static inline void freecell_solver_cache_stacks(
freecell_solver_hard_thread_t * hard_thread,
fcs_state_with_locations_t * new_state
)
@ -498,7 +498,7 @@ guint freecell_solver_hash_function(gconstpointer key)
*
* */
GCC_INLINE int freecell_solver_check_and_add_state(
inline int freecell_solver_check_and_add_state(
freecell_solver_soft_thread_t * soft_thread,
fcs_state_with_locations_t * new_state,
fcs_state_with_locations_t * * existing_state

@ -1,20 +0,0 @@
/*
* 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

@ -16,8 +16,6 @@
#include "dmalloc.h"
#endif
#include "inline.h"
#if 0
/* This variable was used for debugging. */
int msc_counter=0;
@ -369,7 +367,7 @@ void freecell_solver_move_stack_normalize(
freecell_solver_move_stack_swallow_stack(moves, temp_moves);
}
GCC_INLINE int convert_freecell_num(int fcn)
static inline int convert_freecell_num(int fcn)
{
if (fcn >= 7)
return (fcn+3);

@ -7,9 +7,7 @@
* This file is in the public domain (it's uncopyrighted).
* */
#include "inline.h"
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)
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)
{
char * ptr;
fcs_move_stack_t * new_move_stack_to_parent;

@ -6,8 +6,6 @@
extern "C" {
#endif
#include "inline.h"
struct fcs_rand_struct
{
unsigned long seed;
@ -20,7 +18,7 @@ extern void freecell_solver_rand_free(fcs_rand_t * rand);
extern void freecell_solver_rand_srand(fcs_rand_t * rand, unsigned int seed);
static GCC_INLINE int freecell_solver_rand_rand15(fcs_rand_t * rand)
static inline int freecell_solver_rand_rand15(fcs_rand_t * rand)
{
rand->seed = (rand->seed * 214013 + 2531011);
return (rand->seed >> 16) & 0x7fff;
@ -32,7 +30,7 @@ static GCC_INLINE int freecell_solver_rand_rand15(fcs_rand_t * rand)
* 15-bit ones.
*
* */
static GCC_INLINE int freecell_solver_rand_get_random_number(fcs_rand_t * rand)
static inline int freecell_solver_rand_get_random_number(fcs_rand_t * rand)
{
int one, two;
one = freecell_solver_rand_rand15(rand);

Loading…
Cancel
Save