gcl.git - GNU Common Lisp

diff --git a/gcl/h/386-macosx.h b/gcl/h/386-macosx.h
index e5c4dedcd..f40b0b406 100644
--- a/gcl/h/386-macosx.h
+++ b/gcl/h/386-macosx.h

@@ -193,3 +193,7 @@ if (realpath (buf, fub) == 0) { \

#define FPE_INIT ({ucontext_t v;list(3,MMcons(make_simple_string(({const char *s=FPE_RLST;s;})),REG_LIST(21,MC(__ss))), \

REG_LIST(8,MCF(__fpu_stmm0)),REG_LIST(16,MCF(__fpu_xmm0)));})

+

+#include <sys/param.h>/*PATH_MAX MAXPATHLEN*/

+#undef MIN

+#undef MAX

diff --git a/gcl/makefile b/gcl/makefile
index 756f3a20b..291884371 100644
--- a/gcl/makefile
+++ b/gcl/makefile

@@ -265,7 +265,7 @@ $(HDIR)new_decl.h:

$(HDIR)mcompdefs.h: $(HDIR)compdefs.h $(HDIR)new_decl.h

$(AWK) 'BEGIN {print "#include \"include.h\"";print "#include \"cmponly.h\"";print "---"} {a=$1ドル;gsub("\\.\\.\\.","",a);print "\"#define " $1ドル "\" " a}' $< |\

- cpp -I./$(HDIR) |\

+ $(CC) -E -I./$(HDIR) - |\

$(AWK) '/^\-\-\-$$/ {i=1;next} {if (!i) next} {gsub("\"","");print}' >$@

$(HDIR)cmpinclude.h: $(HDIR)mcompdefs.h $(CMPINCLUDE_FILES) $(HDIR)config.h

diff --git a/gcl/o/prelink.c b/gcl/o/prelink.c
index 51725326e..609f72b27 100644
--- a/gcl/o/prelink.c
+++ b/gcl/o/prelink.c

@@ -9,8 +9,8 @@ prelink_init(void) {

my_stdout=stdout;

my_stderr=stderr;

#ifdef HAVE_READLINE

- my_rl_completion_entry_function_ptr=&rl_completion_entry_function;

- my_rl_readline_name_ptr=&rl_readline_name;

+ my_rl_completion_entry_function_ptr=(void *)&rl_completion_entry_function;

+ my_rl_readline_name_ptr=(void *)&rl_readline_name;

#endif

}