Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-13 07:57:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing conflicts in chibi-scheme-static build

Browse source
This commit is contained in:
Alex Shinn 2011-05-18 21:50:48 -07:00
parent 24631a8cf2
commit 280ea1cddb
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/srfi/18/threads.c
View file

@ -40,7 +40,7 @@ static int sexp_mutex_id, sexp_condvar_id, sexp_pollfds_id;
/**************************** threads *************************************/
static void sexp_define_type_predicate (sexp ctx, sexp env, char *cname, sexp_uint_t type) {
static void sexp_define_type_predicate_by_tag (sexp ctx, sexp env, char *cname, sexp_uint_t type) {
sexp_gc_var2(name, op);
sexp_gc_preserve2(ctx, name, op);
name = sexp_c_string(ctx, cname, -1);
@ -565,7 +565,7 @@ sexp sexp_init_library (sexp ctx sexp_api_params(self, n), sexp env) {
if (sexp_typep(t))
sexp_pollfds_id = sexp_type_tag(t);
sexp_define_type_predicate(ctx, env, "thread?", SEXP_CONTEXT);
sexp_define_type_predicate_by_tag(ctx, env, "thread?", SEXP_CONTEXT);
sexp_define_foreign(ctx, env, "thread-timeout?", 0, sexp_thread_timeoutp);
sexp_define_foreign(ctx, env, "current-thread", 0, sexp_current_thread);
sexp_define_foreign_opt(ctx, env, "make-thread", 2, sexp_make_thread, SEXP_FALSE);

4
lib/srfi/95/qsort.c
View file

@ -5,8 +5,12 @@
#include "chibi/eval.h"
#if SEXP_USE_HUFF_SYMS
#if SEXP_USE_STATIC_LIBS
#include "../../../opt/sexp-hufftabdefs.h"
#else
#include "../../../opt/sexp-hufftabs.c"
#endif
#endif
#define swap(tmp_var, a, b) (tmp_var=a, a=b, b=tmp_var)

5
opcodes.c
View file

@ -186,3 +186,8 @@ _OP(SEXP_OPC_GENERIC, SEXP_OP_YIELD, 0, 0, SEXP_VOID, SEXP_FALSE, SEXP_FALSE, SE
_FN1(_I(SEXP_PROMISE), _I(SEXP_PROCEDURE), "make-promise", 0, sexp_make_promise),
#endif
};
#undef _I
#undef _OP
#undef _FN
#undef _PARAM

7
opt/sexp-hufftabdefs.h Normal file
View file

@ -0,0 +1,7 @@
char _huff_tab1[8], _huff_tab2[8], _huff_tab3[2], _huff_tab4[2],
_huff_tab5[4], _huff_tab6[2], _huff_tab7[4], _huff_tab8[4],
_huff_tab9[4], _huff_tab10[4], _huff_tab11[4], _huff_tab12[2],
_huff_tab13[8], _huff_tab14[2], _huff_tab15[8], _huff_tab16[8],
_huff_tab17[8], _huff_tab18[8], _huff_tab19[4], _huff_tab20[8],
_huff_tab21[8];