Commit 936b7fb6 authored by jjgarcia's avatar jjgarcia

Header files are now kept in a directory named 'ecl', so as to avoid name...

Header files are now kept in a directory named 'ecl', so as to avoid name clashes with other headers.
parent 6055075b
......@@ -218,7 +218,7 @@ compile.lsp: bare.lsp $(srcdir)/compile.lsp.in Makefile
"@[email protected]" "ranlib" \
"@LSP_FEATURES@" "$(ECL_FEATURES)" \
< $(srcdir)\compile.lsp.in > compile.lsp
bare.lsp: $(srcdir)/bare.lsp.in lsp/load.lsp clos/load.lsp cmp/load.lsp cmp/cmpcfg.lsp
bare.lsp: $(srcdir)/bare.lsp.in lsp/load.lsp clos/load.lsp cmp/load.lsp cmp/cmpdefs.lsp
c\cut "@[email protected]" "$(srcdir:\=/)" \
"@[email protected]" "$(MAKEDIR:\=/)" < $(srcdir)\bare.lsp.in > bare.lsp
lsp/load.lsp: $(srcdir)/lsp/load.lsp.in
......@@ -229,7 +229,7 @@ clos/load.lsp: $(srcdir)/clos/load.lsp.in
cmp/load.lsp: $(srcdir)/cmp/load.lsp.in
if not exist cmp $(MKDIR) cmp
$(CP) $(srcdir)\cmp\load.lsp.in cmp\load.lsp
cmp/cmpcfg.lsp: $(srcdir)/cmp/cmpcfg.lsp.in Makefile
cmp/cmpcdefs.lsp: $(srcdir)/cmp/cmpdefs.lsp Makefile
c\cut "@[email protected]" "$(CC)" \
"@[email protected]" "$(CFLAGS)" \
"@[email protected]" "" \
......@@ -246,7 +246,10 @@ cmp/cmpcfg.lsp: $(srcdir)/cmp/cmpcfg.lsp.in Makefile
"@[email protected]" "" \
"@[email protected]" "lib" \
"@[email protected]" ".exe" \
< $(srcdir)\cmp\cmpcfg.lsp.in > cmp\cmpcfg.lsp
"@[email protected]" "NIL" \
"@[email protected]" "NIL" \
"@[email protected]" "NIL" \
< $(srcdir)\cmp\cmpdefs.lsp > cmp\cmpdefs.lsp
ecl-config.bat: util\ecl-config.bat Makefile
c\cut "~A" "$(libdir:\=/)"\
"~*" "" \
......@@ -254,14 +257,14 @@ ecl-config.bat: util\ecl-config.bat Makefile
"@[email protected]" "$(LDFLAGS)" \
"@[email protected]" "" \
"@[email protected]" "$(prefix:\=/)" \
"@[email protected]" "$(prefix:\=/)/h" \
"@[email protected]" "$(prefix:\=/)/ecl" \
< util\ecl-config.bat > ecl-config.bat
ecl-cc.bat: util\ecl-cc.bat Makefile
c\cut "@[email protected]" "$(CFLAGS)" \
"@[email protected]" "$(LDFLAGS)" \
"@[email protected]" "" \
"@[email protected]" "$(prefix:\=/)" \
"@[email protected]" "$(prefix:\=/)/h" \
"@[email protected]" "$(prefix:\=/)/ecl" \
< util\ecl-cc.bat > ecl-cc.bat
......@@ -276,12 +279,12 @@ eclgc.lib:
cd ..
for %h in (gc.h gc_local_alloc.h gc_pthread_redirects.h \
gc_config_macros.h leak_detector.h gc_typed.h) \
do $(CP) $(srcdir)\gc\include\%h h\%h
do $(CP) $(srcdir)\gc\include\%h ecl\%h
eclgmp.lib:
cd gmp
$(MAKE) "MPN_TYPE = $(GMP_TYPE)" "MFLAGS = $(MFLAGS)"
$(CP) gmp.lib ..\eclgmp.lib
$(CP) gmp.h ..\h\gmp.h
$(CP) gmp.h ..\ecl\gmp.h
cd ..
sysfun.lsp:
$(CP) $(srcdir)\cmp\sysfun.lsp .\
......@@ -292,15 +295,15 @@ rt.lisp:
install: install-base
for %h in (gc.h gc_local_alloc.h gc_pthread_redirects.h \
gc_config_macros.h leak_detector.h gc_typed.h) \
do $(CP) h\%h $(libdir)\h
$(CP) h\gmp.h $(libdir)\h\gmp.h
do $(CP) ecl\%h $(libdir)\ecl
$(CP) ecl\gmp.h $(libdir)\ecl\gmp.h
cd c
$(MAKE) install "prefix=$(prefix)"
cd ..\doc
$(MAKE) install "prefix=$(prefix)"
install-base:
IF NOT EXIST $(bindir) $(MKDIR) $(bindir)
IF NOT EXIST $(libdir)\h $(MKDIR) $(libdir)\h
IF NOT EXIST $(libdir)\ecl $(MKDIR) $(libdir)\ecl
for %i in ($(TARGETS) ecl.dll) do $(CP) %i $(bindir)\%i
IF EXIST $(bindir)\ecl2$(EXE) $(MV) $(bindir)\ecl2$(EXE) $(bindir)\ecl$(EXE)
$(CP) ecl-config.bat $(bindir)\ecl-config.bat
......@@ -308,7 +311,7 @@ install-base:
for %i in ($(LIBRARIES) c\dpp.exe help.doc ecl.lib) do $(CP) %i $(libdir)
for /f %i in ('type MODULES') do $(CP) %i $(libdir)
for %i in (ecl-static.lib) do IF EXIST %i $(CP) %i $(libdir)
$(CP) h\config.h $(libdir)\h
$(CP) ecl\config.h $(libdir)\ecl
flatinstall:
$(MAKE) bindir=$(prefix) libdir=$(prefix) install-base
cd c
......@@ -344,14 +347,14 @@ clean: clean_ecl clean_lisp clean_doc
cd ..
-for %h in (gc.h gc_local_alloc.h gc_pthread_redirects.h \
gc_config_macros.h leak_detector.h gc_typed.h) \
do $(RM) h\%h
do $(RM) ecl\%h
cd gmp
$(MAKE) "ECL_THREADS = $(ECL_THREADS)" clean
cd ..
-$(RM) h\gmp.h
-$(RM) ecl\gmp.h
clean_ecl:
-for %i in (eclgc.lib eclgmp.lib lsp\config.lsp compile.lsp bare.lsp \
lsp\load.lsp clos\load.lsp cmp\load.lsp cmp\cmpcfg.lsp \
lsp\load.lsp clos\load.lsp cmp\load.lsp cmp\cmpdefs.lsp \
ecl.lib ecl.dll ecl_min$(EXE) eclmin.lib help.doc sysfun.lsp \
$(TARGETS) *.exp *.ilk *.pdb *.c *.obj ecl-config.bat ecl-static.lib) \
do $(RM) %i
......
......@@ -41,7 +41,7 @@ libdir=$(prefix)\lib\ecl
# Files
HDIR = $(top_srcdir)\h
HFILES = ..\h\config.h $(HDIR)\ecl.h $(HDIR)\ecl-cmp.h\
HFILES = ..\ecl\config.h $(HDIR)\ecl.h $(HDIR)\ecl-cmp.h\
$(HDIR)\object.h $(HDIR)\cs.h $(HDIR)\stacks.h\
$(HDIR)\external.h $(HDIR)\eval.h\
$(HDIR)\number.h $(HDIR)\page.h $(HDIR)\unify.h\
......@@ -89,24 +89,24 @@ cut.exe: $(top_srcdir)/util/cut.c
$(CC) $(LDFLAGS) /Fecut.exe $(top_srcdir)/util/cut.c
install: $(HFILES)
for %i in ($(HFILES)) do $(CP) %i $(libdir)\h
cut.exe < ..\h\config.h > $(libdir)\h\config-install.h
$(RM) $(libdir)\h\config.h
$(MV) $(libdir)\h\config-install.h $(libdir)\h\config.h
for %i in ($(HFILES)) do $(CP) %i $(libdir)\ecl
cut.exe < ..\ecl\config.h > $(libdir)\ecl\config-install.h
$(RM) $(libdir)\ecl\config.h
$(MV) $(libdir)\ecl\config-install.h $(libdir)\ecl\config.h
flatinstall: $(HFILES)
for %i in ($(HFILES)) do $(CP) %i $(prefix)\h
cut.exe < ..\h\config.h > $(prefix)\h\config-install.h
for %h in (..\h\*.h) do $(CP) %h $(prefix)\h
$(RM) $(prefix)\h\config.h
$(MV) $(prefix)\h\config-install.h $(prefix)\h\config.h
for %i in ($(HFILES)) do $(CP) %i $(prefix)\ecl
cut.exe < ..\ecl\config.h > $(prefix)\ecl\config-install.h
for %h in (..\ecl\*.h) do $(CP) %h $(prefix)\ecl
$(RM) $(prefix)\ecl\config.h
$(MV) $(prefix)\ecl\config-install.h $(prefix)\ecl\config.h
..\eclmin.lib: $(OBJS:.obj=.c) all_symbols.c $(OBJS) all_symbols.obj all_symbols2.obj
-$(RM) [email protected]
$(LINK) -lib -out:[email protected] $(OBJS)
clean:
-for %f in (..\h\config.h dpp dpp.obj $(DPP) external.h \
-for %f in (..\ecl\config.h dpp dpp.obj $(DPP) external.h \
..\eclmin.lib ..\cinit.obj cinit.c \
symbols_list2.h) \
do $(RM) %f
......@@ -120,7 +120,7 @@ $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list2.h ../h/config.h
$(TRUE_CC) -I../h -I./ -I$(HDIR) $(DEFS) $(srcdir)/dpp.c -o [email protected]
../h/config.h: ../h/config.h.msvc6 Makefile
cut.exe "@[email protected]" "$(srcdir:\=/)/arch/fpe_x86.c" \
< ..\h\config.h.msvc6 > [email protected]
< ..\ecl\config.h.msvc6 > [email protected]
#
# GCC might break this code
......
......@@ -60,6 +60,9 @@ ECL 0.9i
- When passed the option --help, -h or -?, ECL no longer loads the rc file
(which is typically ~/.ecl or ~/.eclrc)
- Header files are now included with a prefix, as in #include <ecl/ecl.h>
or #include <ecl/config.h> to avoid collisions with other system files.
* Errors fixed:
- The intermediate output of the compiler is written in the directory in which
......
......@@ -27,6 +27,7 @@ [email protected]@
exec_prefix=@[email protected]
bindir=@[email protected]
libdir=@[email protected]
includedir=@[email protected]
# Programs used by "make install":
#
......@@ -44,7 +45,7 @@ LIBRARIES = @[email protected]
LSP_LIBRARIES = @[email protected]
TARGETS = @[email protected]
all: $(TARGETS) ecl-config doc
all: $(TARGETS) bin/ecl-config doc
.PHONY: all
%Makefile: $(srcdir)/%Makefile.in config.status
......@@ -57,11 +58,11 @@ all: $(TARGETS) ecl-config doc
#
c/external.h: $(top_srcdir)/h/external.h
sed 's,__declspec(dllimport),,g' $(top_srcdir)/h/external.h > [email protected]
h/external.h: c/external.h
cp $(srcdir)/h/*.h h/
if grep 'undef ENABLE_DLOPEN' h/config.h; then cp c/external.h h; fi
ecl/external.h: c/external.h
cp $(srcdir)/h/*.h ecl/
if grep 'undef ENABLE_DLOPEN' ecl/config.h; then cp c/external.h h; fi
ecl$(EXE): ecl_min$(EXE) compile.lsp sysfun.lsp h/external.h
bin/ecl$(EXE): ecl_min$(EXE) compile.lsp sysfun.lsp ecl/external.h
if [ -f CROSS-COMPILER ]; then \
./CROSS-COMPILER < compile.lsp; \
else \
......@@ -80,21 +81,26 @@ ecl_min$(EXE): $(LIBRARIES) .gdbinit @[email protected]@[email protected]
lsp/config.lsp: lsp/config.pre
sed -e 's,@[email protected],$(libdir),g' < lsp/config.pre > lsp/config.lsp
cmp/cmpdefs.lsp: cmp/cmpdefs.pre
sed -e 's,@[email protected],"$(libdir)",g' \
-e 's,@[email protected],"$(libdir)",g' \
-e 's,@[email protected],"$(includedir)",g' < cmp/cmpdefs.pre > [email protected]
compile.lsp: compile.pre
sed -e 's,@[email protected],$(libdir),g' < compile.pre > compile.lsp
ecl-config: ecl-config.pre
bin/ecl-config: bin/ecl-config.pre
sed -e 's,~A,$(libdir),;s,~\*,,' \
-e 's,@libdir\\@,$(libdir),' \
-e 's,@includedir\\@,$(libdir)/h,' ecl-config.pre > ecl-config
-e 's,@ecllibdir\\@,$(libdir),' \
-e 's,@ecincludedir\\@,$(includedir),' bin/ecl-config.pre > bin/ecl-config
@[email protected]@[email protected]: @[email protected]@[email protected] @[email protected]@[email protected] lsp/config.lsp h/external.h
@[email protected]@[email protected]: @[email protected]@[email protected] @[email protected]@[email protected] lsp/config.lsp cmp/cmpdefs.lsp ecl/external.h
cd c; $(MAKE)
@[email protected]@[email protected]:
if (echo $(SUBDIRS) | grep gc); then \
cd gc; $(MAKE) install; \
cp -rf $(srcdir)/gc/include/private ../h/gc/; \
mv ../@[email protected]@[email protected] ../@[email protected]@[email protected]; \
cd ..; rm -rf ecl/gc; mv h/* ecl/; \
cp -rf $(srcdir)/gc/include/private ecl/gc/; \
mv @[email protected]@[email protected] @[email protected]@[email protected]; \
fi
@[email protected]@[email protected]:
if (echo $(SUBDIRS) | grep gmp); then \
......@@ -114,13 +120,13 @@ install: BUILD-STAMP install-base
cd c; $(MAKE) prefix=$(prefix) DESTDIR=$(DESTDIR) install
cd doc; $(MAKE) prefix=$(prefix) DESTDIR=$(DESTDIR) install
install-base:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/h
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/ecl
# Here we would use the option -s but the install program in sourceforge-solaris
# is broken.
for i in $(TARGETS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \
done;
$(INSTALL_SCRIPT) ecl-config $(DESTDIR)$(bindir)
$(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir)
for i in BUILD-STAMP help.doc ; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(libdir); \
done
......@@ -145,7 +151,7 @@ doc: $(TARGETS)
clean: clean_lisp
for i in $(SUBDIRS); do (cd $$i; $(MAKE) clean); done
$(RM) ecl_min$(EXE) ecl$(EXE) help.doc core a.out
$(RM) ecl_min$(EXE) bin/ecl$(EXE) help.doc core a.out
$(RM) config.version config.log config.cache
$(RM) *.c *.o *.a *.h *.data *.fas
clean_lisp:
......
......@@ -33,7 +33,6 @@
;;; * Load PCL-based Common-Lisp Object System
;;;
(setf sys::*gc-verbose* nil)
(print *features*)
#+(or ecl-min cross)
(load "clos/load.lsp")
#+cmu-format
......
......@@ -9,7 +9,7 @@ VPATH = @[email protected]
#
TRUE_CC = @[email protected]
CC = @[email protected]
CFLAGS = -c -I. -I$(srcdir) -I$(srcdir)/gc -I$(HDIR) -I../h @[email protected] @[email protected] \
CFLAGS = -c -I. -I$(srcdir) -I$(srcdir)/gc -I../ @[email protected] @[email protected] \
@[email protected] \
# -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align \
# -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-prototypes -Wredundant-decls \
......@@ -28,11 +28,12 @@ INSTALL_DATA = @[email protected]
prefix=@[email protected]
exec_prefix=@[email protected]
libdir=@[email protected]
includedir=@[email protected]
# Files
HDIR = ../h
HFILES = ../h/config.h $(HDIR)/ecl.h $(HDIR)/ecl-cmp.h\
HDIR = ../ecl
HFILES = ../ecl/config.h $(HDIR)/ecl.h $(HDIR)/ecl-cmp.h\
$(HDIR)/object.h $(HDIR)/cs.h $(HDIR)/stacks.h\
$(HDIR)/external.h $(HDIR)/eval.h\
$(HDIR)/number.h $(HDIR)/page.h $(HDIR)/unify.h\
......@@ -64,18 +65,14 @@ ffi_x86.c: arch/ffi_x86.d $(DPP) $(HFILES)
if test -f ../CROSS-DPP ; then ../CROSS-DPP $< [email protected] ; else $(DPP) $< [email protected] ; fi
install: $(HFILES)
for i in $(HFILES); do $(INSTALL_DATA) $$i $(DESTDIR)$(libdir)/h/; done
sed '/-CUT-/,$$d' ../h/config.h > ../h/config-install.h
$(INSTALL_DATA) ../h/*.h $(DESTDIR)$(libdir)/h/
rm $(DESTDIR)$(libdir)/h/config.h
mv $(DESTDIR)$(libdir)/h/config-install.h $(DESTDIR)$(libdir)/h/config.h
for i in $(HFILES); do $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ecl/; done
sed '/-CUT-/,$$d' ../ecl/config.h > ../ecl/config-install.h
$(INSTALL_DATA) ../ecl/*.h $(DESTDIR)$(includedir)/ecl
rm $(DESTDIR)$(includedir)/ecl/config.h
mv $(DESTDIR)$(includedir)/ecl/config-install.h $(DESTDIR)$(includedir)/ecl/config.h
flatinstall: $(HFILES)
for i in $(HFILES); do $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/h/; done
sed '/-CUT-/,$$d' ../h/config.h > ../h/config-install.h
$(INSTALL_DATA) ../h/*.h $(DESTDIR)$(prefix)/h/
rm $(DESTDIR)$(prefix)/h/config.h
mv $(DESTDIR)$(prefix)/h/config-install.h $(DESTDIR)$(prefix)/h/config.h
make includedir=$(DESTDIR)$(prefix) install
../libeclmin.a: $(OBJS) all_symbols.o all_symbols2.o
$(RM) [email protected]
......@@ -89,7 +86,7 @@ clean:
$(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list2.h
if test -f ../CROSS-DPP; then touch dpp; else \
$(TRUE_CC) @[email protected] @[email protected] -I$(srcdir) -I../h -I./ -I$(HDIR) $(DEFS) $(srcdir)/dpp.c -o [email protected] ; \
$(TRUE_CC) @[email protected] @[email protected] -I$(srcdir) -I../ -I./ $(DEFS) $(srcdir)/dpp.c -o [email protected] ; \
fi
$(srcdir)/symbols_list2.h: $(srcdir)/symbols_list.h Makefile
cat $(srcdir)/symbols_list.h | \
......
#include <ecl/ecl.h>
#include <ctype.h>
#include "ecl.h"
#include "internal.h"
#include <limits.h>
#include <ecl/internal.h>
#define CL_PACKAGE 0
#define SI_PACKAGE 4
......
......@@ -34,9 +34,9 @@
#include <unistd.h>
#include <string.h>
#include "ecl.h"
#include "internal.h"
#include "page.h"
#include <ecl/ecl.h>
#include <ecl/internal.h>
#include <ecl/page.h>
#define USE_MMAP
#if defined(USE_MMAP)
......
......@@ -15,16 +15,11 @@
#if defined(ECL_THREADS) && !defined(_MSC_VER)
#include <pthread.h>
#endif
#include "ecl.h"
#include "internal.h"
#include "page.h"
#ifdef _MSC_VER
#include "gc.h"
#include "private/gc_priv.h"
#else
#include "gc/gc.h"
#include "gc/private/gc_priv.h"
#endif
#include <ecl/ecl.h>
#include <ecl/internal.h>
#include <ecl/page.h>
#include <ecl/gc/gc.h>
#include <ecl/gc/private/gc_priv.h>
#ifdef GBC_BOEHM
......
......@@ -14,7 +14,7 @@
*/
#include "ecl.h"
#include <ecl/ecl.h>
cl_object
APPLY(cl_narg n, cl_objectfn fn, cl_object *x)
......
......@@ -12,9 +12,9 @@
See file '../Copyright' for full details.
*/
#include <ecl.h>
#include <ecl/ecl.h>
#include <string.h>
#include <internal.h>
#include <ecl/internal.h>
void
ecl_fficall_push_arg(union ecl_ffi_values *data, enum ecl_ffi_tag type)
......
......@@ -16,7 +16,7 @@
#include <limits.h>
#include <string.h>
#include "ecl.h"
#include <ecl/ecl.h>
static const cl_index ecl_aet_size[] = {
sizeof(cl_object), /* aet_object */
......
......@@ -14,7 +14,7 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include <ecl/ecl.h>
#include <string.h>
cl_object
......
......@@ -14,8 +14,8 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include "internal.h"
#include <ecl/ecl.h>
#include <ecl/internal.h>
/******************************* ------- ******************************/
......
......@@ -14,8 +14,8 @@
*/
#include <string.h>
#include "ecl.h"
#include "internal.h"
#include <ecl/ecl.h>
#include <ecl/internal.h>
/*
* Using GMP multiple precision integers:
......
......@@ -12,8 +12,8 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include "internal.h"
#include <ecl/ecl.h>
#include <ecl/internal.h>
cl_object
big_register0_get(void)
......
......@@ -14,7 +14,7 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include <ecl/ecl.h>
#include <string.h> /* for memmove() */
cl_object
......
......@@ -14,7 +14,7 @@
*/
#include "ecl.h"
#include <ecl/ecl.h>
#include <ctype.h>
cl_fixnum
......
......@@ -13,8 +13,8 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include "internal.h"
#include <ecl/ecl.h>
#include <ecl/internal.h>
/*
* HOOKS.
......
......@@ -15,8 +15,8 @@
*/
#include <limits.h>
#include "ecl.h"
#include "ecl-inl.h"
#include <ecl/ecl.h>
#include <ecl/ecl-inl.h>
cl_object
si_specialp(cl_object sym)
......
......@@ -26,10 +26,10 @@
are marked with flag [1].
*/
#include <string.h>
#include "ecl.h"
#include "ecl-inl.h"
#include "internal.h"
#include "bytecodes.h"
#include <ecl/ecl.h>
#include <ecl/ecl-inl.h>
#include <ecl/internal.h>
#include <ecl/bytecodes.h>
/********************* EXPORTS *********************/
......
......@@ -12,9 +12,9 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include "ecl-inl.h"
#include "bytecodes.h"
#include <ecl/ecl.h>
#include <ecl/ecl-inl.h>
#include <ecl/bytecodes.h>
static cl_opcode *disassemble(cl_object bytecodes, cl_opcode *vector);
......
......@@ -73,7 +73,7 @@
#include <string.h>
#define DPP
#include "config.h"
#include <ecl/config.h>
#include "symbols_list2.h"
#define POOLSIZE 2048
......
......@@ -39,7 +39,7 @@
represented as 32 bit non-negative integer.
*/
#include "ecl.h"
#include <ecl/ecl.h>
#ifdef CONVEX
......
......@@ -14,8 +14,7 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include "internal.h"
#include <ecl/ecl.h>
#include <string.h>
#include <errno.h>
#include <signal.h>
......@@ -23,6 +22,7 @@
#if defined(mingw32) || defined(_MSC_VER)
#include <windows.h>
#endif
#include <ecl/internal.h>
void
cs_overflow(void)
......
......@@ -15,8 +15,8 @@
*/
#include "ecl.h"
#include "ecl-inl.h"
#include <ecl/ecl.h>
#include <ecl/ecl-inl.h>
/* Calling conventions:
Compiled C code calls lisp function supplying #args, and args.
......
......@@ -13,8 +13,8 @@
*/
#include <string.h>
#include "ecl.h"
#include "internal.h"
#include <ecl/ecl.h>
#include <ecl/internal.h>
static const cl_object ecl_foreign_type_table[] = {
@':char',
......
......@@ -21,12 +21,12 @@
by accessing the FILE structure of C.
*/
#include <ecl/ecl.h>
#include <fcntl.h>
#include <string.h>
#include <stdio.h>
#include <ecl.h>
#include "ecl-inl.h"
#include "internal.h"
#include <ecl/ecl-inl.h>
#include <ecl/internal.h>
#ifdef HAVE_SELECT
#include <sys/select.h>
......
......@@ -14,10 +14,10 @@
See file '../Copyright' for full details.
*/
#include <ecl/ecl.h>
#include <ctype.h>
#include <limits.h>
#include "ecl.h"
#include "internal.h"
#include <ecl/internal.h>
#if !defined(ECL_CMU_FORMAT)
#define FMT_MAX_PARAM 8
......
......@@ -17,10 +17,10 @@
#ifdef ECL_THREADS
#include <pthread.h>
#endif
#include "ecl.h"
#include "page.h"
#include "internal.h"
#include "bytecodes.h"
#include <ecl/ecl.h>
#include <ecl/page.h>
#include <ecl/internal.h>
#include <ecl/bytecodes.h>
/******************************* EXPORTS ******************************/
......
......@@ -12,8 +12,8 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include "internal.h"
#include <ecl/ecl.h>
#include <ecl/internal.h>
cl_object
si_set_funcallable(cl_object instance, cl_object flag)
......
......@@ -14,11 +14,11 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include <ecl/ecl.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include "internal.h"
#include <ecl/internal.h>
/********************
* HASHING ROUTINES *
......
......@@ -13,7 +13,7 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include <ecl/ecl.h>
#include <string.h>
cl_object
......
......@@ -12,10 +12,10 @@
See file '../Copyright' for full details.
*/
#include <ecl/ecl.h>
#include <string.h>
#include "ecl.h"
#include "ecl-inl.h"
#include "bytecodes.h"
#include <ecl/ecl-inl.h>
#include <ecl/bytecodes.h>
#undef frs_pop
#define frs_pop() { \
......
......@@ -14,8 +14,8 @@
See file '../Copyright' for full details.
*/
#include "ecl.h"
#include "ecl-inl.h"
#include <ecl/ecl.h>
#include <ecl/ecl-inl.h>
struct cl_test {
bool (*test_c_function)(struct cl_test *, cl_object);
......
......@@ -13,10 +13,10 @@
See file '../Copyright' for full details.
*/
#include <ecl/ecl.h>
#include <string.h>
#include "ecl.h"
#include "ecl-inl.h"
#include "internal.h"
#include <ecl/ecl-inl.h>
#include <ecl/internal.h>
#ifdef ENABLE_DLOPEN
# ifdef HAVE_MACH_O_DYLD_H
......