[uim-commit] r3056 - in branches/r5rs/sigscheme: . src
yamaken at freedesktop.org
yamaken at freedesktop.org
Tue Jan 31 19:43:41 PST 2006
Author: yamaken
Date: 2006-01-31 19:43:38 -0800 (Tue, 31 Jan 2006)
New Revision: 3056
Modified:
branches/r5rs/sigscheme/configure.in
branches/r5rs/sigscheme/src/Makefile.am
branches/r5rs/sigscheme/src/basecport.c
branches/r5rs/sigscheme/src/config.h
branches/r5rs/sigscheme/src/encoding.c
branches/r5rs/sigscheme/src/env.c
branches/r5rs/sigscheme/src/eval.c
branches/r5rs/sigscheme/src/fileport.c
branches/r5rs/sigscheme/src/load.c
branches/r5rs/sigscheme/src/main.c
branches/r5rs/sigscheme/src/mbcport.c
branches/r5rs/sigscheme/src/module-nonstd.c
branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c
branches/r5rs/sigscheme/src/module-siod.c
branches/r5rs/sigscheme/src/module-srfi1.c
branches/r5rs/sigscheme/src/module-srfi2.c
branches/r5rs/sigscheme/src/module-srfi23.c
branches/r5rs/sigscheme/src/module-srfi34.c
branches/r5rs/sigscheme/src/module-srfi38.c
branches/r5rs/sigscheme/src/module-srfi6.c
branches/r5rs/sigscheme/src/module-srfi60.c
branches/r5rs/sigscheme/src/module-srfi8.c
branches/r5rs/sigscheme/src/module.c
branches/r5rs/sigscheme/src/nullport.c
branches/r5rs/sigscheme/src/port.c
branches/r5rs/sigscheme/src/procedure.c
branches/r5rs/sigscheme/src/read.c
branches/r5rs/sigscheme/src/sbcport.c
branches/r5rs/sigscheme/src/sigscheme.c
branches/r5rs/sigscheme/src/sigschemefunctable.c
branches/r5rs/sigscheme/src/storage-continuation.c
branches/r5rs/sigscheme/src/storage-gc.c
branches/r5rs/sigscheme/src/storage-symbol.c
branches/r5rs/sigscheme/src/storage.c
branches/r5rs/sigscheme/src/syntax.c
branches/r5rs/sigscheme/src/test-compact.c
branches/r5rs/sigscheme/src/write.c
Log:
* sigscheme/configure.in
- (noinst_LTLIBRARIES): Comment out
- (lib_LTLIBRARIES): New variable
- (pkginclude_HEADERS):
* New variable
* Add sigscheme.h, config.h, storage-compact.h, storage-fatty.h
and encoding.h conditionally
- (USE_CONTINUATION, USE_QUASIQUOTE, USE_HYGIENIC_MACRO, USE_INT,
USE_RATIONAL, USE_REAL, USE_COMPLEX, USE_NUMBER, USE_CHAR,
USE_STRING, USE_VECTOR, USE_PORT, USE_READER, USE_WRITER,
USE_LOAD, USE_DEEP_CADRS, USE_NONSTD_FEATURES, USE_LEGACY_MACRO,
USE_DUMP, USE_EVAL_C_STRING, USE_SRFI1, USE_SRFI2, USE_SRFI6,
USE_SRFI8, USE_SRFI22, USE_SRFI23, USE_SRFI34, USE_SRFI38,
USE_SRFI60, USE_SRFI75_NAMED_CHARS, USE_SRFI75, COMPAT_SIOD,
COMPAT_SIOD_BUGS, USE_UTF8, USE_EUCCN, USE_EUCJP, USE_EUCKR,
USE_SJIS, USE_MULTIBYTE_CHAR, USE_UTF8_AS_DEFAULT,
USE_EUCCN_AS_DEFAULT, USE_EUCJP_AS_DEFAULT, USE_EUCKR_AS_DEFAULT,
USE_SJIS_AS_DEFAULT, STRICT_R5RS, STRICT_NULL_FORM,
STRICT_VECTOR_FORM, STRICT_ARGCHECK, STRICT_DEFINE_PLACEMENT,
STRICT_ENCODING_CHECK, CONST_LIST_LITERAL, CONST_VECTOR_LITERAL,
ACCESSOR_ASSERT, USE_VALUECONS, USE_NULL_CAPABLE_STRING,
USE_STORAGE_COMPACT): New automake variable
* sigscheme/src/Makefile.am
- Compile libsscm_la_SOURCES separatedly
* sigscheme/src/config.h
- Modify section organization
* sigscheme/src/basecport.c
* sigscheme/src/encoding.c
* sigscheme/src/env.c
* sigscheme/src/eval.c
* sigscheme/src/fileport.c
* sigscheme/src/load.c
* sigscheme/src/main.c
* sigscheme/src/mbcport.c
* sigscheme/src/module-nonstd.c
* sigscheme/src/module-r5rs-deepcadrs.c
* sigscheme/src/module-srfi1.c
* sigscheme/src/module-srfi2.c
* sigscheme/src/module-srfi8.c
* sigscheme/src/module-srfi23.c
* sigscheme/src/module-srfi34.c
* sigscheme/src/module-srfi38.c
* sigscheme/src/module-srfi60.c
* sigscheme/src/module.c
* sigscheme/src/nullport.c
* sigscheme/src/read.c
* sigscheme/src/sbcport.c
* sigscheme/src/sigscheme.c
* sigscheme/src/sigschemefunctable.c
* sigscheme/src/storage-continuation.c
* sigscheme/src/storage-gc.c
* sigscheme/src/storage-symbol.c
* sigscheme/src/storage.c
* sigscheme/src/syntax.c
* sigscheme/src/test-compact.c
* sigscheme/src/write.c
- Include config.h
* sigscheme/src/procedure.c
* sigscheme/src/port.c
* sigscheme/src/module-siod.c
* sigscheme/src/module-srfi6.c
- Ditto
- Remove direct inclusion of *.c
Modified: branches/r5rs/sigscheme/configure.in
===================================================================
--- branches/r5rs/sigscheme/configure.in 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/configure.in 2006-02-01 03:43:38 UTC (rev 3056)
@@ -89,6 +89,76 @@
CFLAGS="$CFLAGS -Wall -std=gnu89 -pedantic -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare"
fi
+# FIXME: configure variables appropriately
+use_yes="yes"
+use_no="no"
+# R5RS Features
+AM_CONDITIONAL(USE_CONTINUATION, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_QUASIQUOTE, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_HYGIENIC_MACRO, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_INT, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_RATIONAL, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_REAL, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_COMPLEX, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_NUMBER, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_CHAR, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_STRING, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_VECTOR, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_PORT, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_READER, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_WRITER, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_LOAD, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_DEEP_CADRS, test "x$use_yes" = xyes)
+
+# Optional Features
+AM_CONDITIONAL(USE_NONSTD_FEATURES, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_LEGACY_MACRO, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_DUMP, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_EVAL_C_STRING, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI1, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_SRFI2, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI6, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI8, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI22, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI23, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI34, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI38, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI60, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI75_NAMED_CHARS, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SRFI75, test "x$use_yes" = xyes)
+AM_CONDITIONAL(COMPAT_SIOD, test "x$use_yes" = xyes)
+AM_CONDITIONAL(COMPAT_SIOD_BUGS, test "x$use_yes" = xyes)
+
+# Character Encoding Handlers
+AM_CONDITIONAL(USE_UTF8, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_EUCCN, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_EUCJP, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_EUCKR, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_SJIS, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_MULTIBYTE_CHAR, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_UTF8_AS_DEFAULT, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_EUCCN_AS_DEFAULT, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_EUCJP_AS_DEFAULT, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_EUCKR_AS_DEFAULT, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_SJIS_AS_DEFAULT, test "x$use_no" = xyes)
+
+# Internal Behaviors
+AM_CONDITIONAL(STRICT_R5RS, test "x$use_no" = xyes)
+AM_CONDITIONAL(STRICT_NULL_FORM, test "x$use_no" = xyes)
+AM_CONDITIONAL(STRICT_VECTOR_FORM, test "x$use_yes" = xyes)
+AM_CONDITIONAL(STRICT_ARGCHECK, test "x$use_yes" = xyes)
+AM_CONDITIONAL(STRICT_DEFINE_PLACEMENT, test "x$use_yes" = xyes)
+AM_CONDITIONAL(STRICT_ENCODING_CHECK, test "x$use_yes" = xyes)
+AM_CONDITIONAL(CONST_LIST_LITERAL, test "x$use_yes" = xyes)
+AM_CONDITIONAL(CONST_VECTOR_LITERAL, test "x$use_yes" = xyes)
+AM_CONDITIONAL(ACCESSOR_ASSERT, test "x$use_no" = xyes)
+AM_CONDITIONAL(USE_VALUECONS, test "x$use_yes" = xyes)
+AM_CONDITIONAL(USE_NULL_CAPABLE_STRING, test "x$use_yes" = xyes)
+
+# Storage configurations
+# FIXME
+AM_CONDITIONAL(USE_STORAGE_COMPACT, test "x$use_no" = xyes)
+
AC_CONFIG_FILES([Makefile
m4/Makefile
src/Makefile])
Modified: branches/r5rs/sigscheme/src/Makefile.am
===================================================================
--- branches/r5rs/sigscheme/src/Makefile.am 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/Makefile.am 2006-02-01 03:43:38 UTC (rev 3056)
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libsscm.la
+#noinst_LTLIBRARIES = libsscm.la
+lib_LTLIBRARIES = libsscm.la
FUNC_TABLES = \
sigschemefunctable-r5rs-syntax.c \
@@ -59,18 +60,88 @@
$(BUILD_FUNCTBL) "scm_siod_func_info_table" $< > $@
EXTRA_DIST = $(FUNC_TABLES) $(BUILD_FUNCTBL_SOURCES) \
- storage-fatty.h storage-compact.h
+ test-compact.c
+
+pkginclude_HEADERS = sigscheme.h config.h
+
libsscm_la_SOURCES = \
- config-asprintf.h \
- alloc.c storage.c storage-gc.c storage-symbol.c \
- storage-continuation.c \
- encoding.c error.c \
- env.c eval.c syntax.c list.c number.c string.c vector.c \
- port.c read.c write.c load.c module.c \
- basecport.c fileport.c \
- procedure.c \
- sigscheme.c sigschemefunctable.c \
- sigscheme.h sigschemefunctable.h
+ config-nonstd-string.h config-asprintf.h \
+ alloc.c storage.c storage-gc.c storage-symbol.c \
+ error.c env.c eval.c syntax.c procedure.c list.c \
+ module.c \
+ sigscheme.c sigschemefunctable.c \
+ sigschemeinternal.h sigschemefunctable.h
+if USE_STORAGE_COMPACT
+ pkginclude_HEADERS += storage-compact.h
+else
+ pkginclude_HEADERS += storage-fatty.h
+endif
+if USE_CONTINUATION
+ libsscm_la_SOURCES += storage-continuation.c
+endif
+if USE_NUMBER
+ libsscm_la_SOURCES += number.c
+endif
+if USE_STRING
+ libsscm_la_SOURCES += string.c
+endif
+if USE_VECTOR
+ libsscm_la_SOURCES += vector.c
+endif
+if USE_PORT
+ libsscm_la_SOURCES += port.c baseport.h basecport.c fileport.h fileport.c
+if USE_MULTIBYTE_CHAR
+ libsscm_la_SOURCES += mbcport.h mbcport.c
+else
+ libsscm_la_SOURCES += sbcport.h sbcport.c
+endif
+endif
+if USE_READER
+ libsscm_la_SOURCES += read.c
+endif
+if USE_WRITER
+ libsscm_la_SOURCES += write.c
+endif
+if USE_LOAD
+ libsscm_la_SOURCES += load.c
+endif
+if USE_MULTIBYTE_CHAR
+ pkginclude_HEADERS += encoding.h
+ libsscm_la_SOURCES += encoding.c
+endif
+if USE_DEEP_CADRS
+ libsscm_la_SOURCES += module-r5rs-deepcadrs.c
+endif
+if USE_NONSTD_FEATURES
+ libsscm_la_SOURCES += module-nonstd.c
+endif
+if COMPAT_SIOD
+ libsscm_la_SOURCES += module-siod.c nullport.h nullport.c
+endif
+if USE_SRFI1
+ libsscm_la_SOURCES += module-srfi1.c
+endif
+if USE_SRFI2
+ libsscm_la_SOURCES += module-srfi2.c
+endif
+if USE_SRFI6
+ libsscm_la_SOURCES += module-srfi6.c strport.h strport.c
+endif
+if USE_SRFI8
+ libsscm_la_SOURCES += module-srfi8.c
+endif
+if USE_SRFI23
+ libsscm_la_SOURCES += module-srfi23.c
+endif
+if USE_SRFI34
+ libsscm_la_SOURCES += module-srfi34.c
+endif
+if USE_SRFI38
+ libsscm_la_SOURCES += module-srfi38.c
+endif
+if USE_SRFI60
+ libsscm_la_SOURCES += module-srfi60.c
+endif
libsscm_la_CFLAGS = -Wall
Modified: branches/r5rs/sigscheme/src/basecport.c
===================================================================
--- branches/r5rs/sigscheme/src/basecport.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/basecport.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -38,6 +38,8 @@
* into another
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/config.h
===================================================================
--- branches/r5rs/sigscheme/src/config.h 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/config.h 2006-02-01 03:43:38 UTC (rev 3056)
@@ -112,13 +112,13 @@
#define SCM_ACCESSOR_ASSERT 0 /* enable strict type check with accessor */
#define SCM_USE_VALUECONS 1 /* use experimental values passing */
#define SCM_USE_NULL_CAPABLE_STRING 1 /* enable experimental null character in a middle of a string */
+
+/*===========================================================================
+ Storage configurations
+===========================================================================*/
#define SCM_OBJ_COMPACT 0 /* object representation compaction (experimental) */
-
#define SCM_GCC4_READY_GC 1 /* use experimental gcc4-ready stack protection */
-/*===========================================================================
- Memory configurations
-===========================================================================*/
/* on-stack initial token buffer size for parser */
#define SCM_INITIAL_STRING_BUF_SIZE 64
#define SCM_INITIAL_SYMBOL_BUF_SIZE 64
Modified: branches/r5rs/sigscheme/src/encoding.c
===================================================================
--- branches/r5rs/sigscheme/src/encoding.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/encoding.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -39,6 +39,8 @@
/* This file is going to be portable. Don't depend on SigScheme if possible. */
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/env.c
===================================================================
--- branches/r5rs/sigscheme/src/env.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/env.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -64,6 +64,8 @@
* hand-maid invalid environment objects.
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/eval.c
===================================================================
--- branches/r5rs/sigscheme/src/eval.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/eval.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/fileport.c
===================================================================
--- branches/r5rs/sigscheme/src/fileport.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/fileport.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -39,6 +39,8 @@
* into another
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/load.c
===================================================================
--- branches/r5rs/sigscheme/src/load.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/load.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/main.c
===================================================================
--- branches/r5rs/sigscheme/src/main.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/main.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/mbcport.c
===================================================================
--- branches/r5rs/sigscheme/src/mbcport.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/mbcport.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -38,6 +38,8 @@
* into another
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-nonstd.c
===================================================================
--- branches/r5rs/sigscheme/src/module-nonstd.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-nonstd.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c
===================================================================
--- branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-siod.c
===================================================================
--- branches/r5rs/sigscheme/src/module-siod.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-siod.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
@@ -280,6 +283,3 @@
scm_out = saved_output_port;
}
}
-
-/* FIXME: link conditionally with autoconf */
-#include "nullport.c"
Modified: branches/r5rs/sigscheme/src/module-srfi1.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi1.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi1.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -39,6 +39,8 @@
* safe and simple coding elements.
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-srfi2.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi2.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi2.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -33,6 +33,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-srfi23.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi23.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi23.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-srfi34.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi34.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi34.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -42,6 +42,8 @@
* since SigScheme doesn't have a module or namespace feature (yet)
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-srfi38.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi38.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi38.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -34,6 +34,8 @@
/* Only write/ss is provided currently. */
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
@@ -42,6 +44,7 @@
Local Include
=======================================*/
#include "sigscheme.h"
+#include "sigschemeinternal.h"
/*=======================================
File Local Struct Declarations
Modified: branches/r5rs/sigscheme/src/module-srfi6.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi6.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi6.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
@@ -139,7 +141,3 @@
return MAKE_STRING(new_str, mb_len);
}
-
-
-/* FIXME: link conditionally with autoconf */
-#include "strport.c"
Modified: branches/r5rs/sigscheme/src/module-srfi60.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi60.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi60.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module-srfi8.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi8.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module-srfi8.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/module.c
===================================================================
--- branches/r5rs/sigscheme/src/module.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/module.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/nullport.c
===================================================================
--- branches/r5rs/sigscheme/src/nullport.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/nullport.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -38,6 +38,8 @@
* into another
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/port.c
===================================================================
--- branches/r5rs/sigscheme/src/port.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/port.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
@@ -534,10 +537,3 @@
scm_port_put_char(port, SCM_CHAR_VALUE(obj));
return SCM_UNDEF;
}
-
-/* FIXME: link conditionally with autoconf */
-#if SCM_USE_MULTIBYTE_CHAR
-#include "mbcport.c"
-#else /* SCM_USE_MULTIBYTE_CHAR */
-#include "sbcport.c"
-#endif /* SCM_USE_MULTIBYTE_CHAR */
Modified: branches/r5rs/sigscheme/src/procedure.c
===================================================================
--- branches/r5rs/sigscheme/src/procedure.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/procedure.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -33,11 +33,6 @@
===========================================================================*/
#include "config.h"
-#if SCM_USE_SRFI6
-/* FIXME: remove this for direct inclusion of module-srfi6.c and
- * strport.c */
-#include "config-asprintf.h"
-#endif
/*=======================================
System Include
@@ -406,37 +401,3 @@
return scm_dynamic_wind(before, thunk, after);
}
-
-#if SCM_USE_DEEP_CADRS
-#include "module-r5rs-deepcadrs.c"
-#endif
-#if SCM_USE_NONSTD_FEATURES
-#include "module-nonstd.c"
-#endif
-#if SCM_USE_SRFI1
-#include "module-srfi1.c"
-#endif
-#if SCM_USE_SRFI2
-#include "module-srfi2.c"
-#endif
-#if SCM_USE_SRFI6
-#include "module-srfi6.c"
-#endif
-#if SCM_USE_SRFI8
-#include "module-srfi8.c"
-#endif
-#if SCM_USE_SRFI23
-#include "module-srfi23.c"
-#endif
-#if SCM_USE_SRFI34
-#include "module-srfi34.c"
-#endif
-#if SCM_USE_SRFI38
-#include "module-srfi38.c"
-#endif
-#if SCM_USE_SRFI60
-#include "module-srfi60.c"
-#endif
-#if SCM_COMPAT_SIOD
-#include "module-siod.c"
-#endif
Modified: branches/r5rs/sigscheme/src/read.c
===================================================================
--- branches/r5rs/sigscheme/src/read.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/read.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -33,6 +33,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/sbcport.c
===================================================================
--- branches/r5rs/sigscheme/src/sbcport.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/sbcport.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -38,6 +38,8 @@
* into another
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/sigscheme.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/sigschemefunctable.c
===================================================================
--- branches/r5rs/sigscheme/src/sigschemefunctable.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/sigschemefunctable.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/storage-continuation.c
===================================================================
--- branches/r5rs/sigscheme/src/storage-continuation.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/storage-continuation.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/storage-gc.c
===================================================================
--- branches/r5rs/sigscheme/src/storage-gc.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/storage-gc.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -53,6 +53,8 @@
* - collects unmarked objects on heaps into the freelist.
*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/storage-symbol.c
===================================================================
--- branches/r5rs/sigscheme/src/storage-symbol.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/storage-symbol.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/storage.c
===================================================================
--- branches/r5rs/sigscheme/src/storage.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/storage.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/syntax.c
===================================================================
--- branches/r5rs/sigscheme/src/syntax.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/syntax.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -32,6 +32,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
Modified: branches/r5rs/sigscheme/src/test-compact.c
===================================================================
--- branches/r5rs/sigscheme/src/test-compact.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/test-compact.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
Modified: branches/r5rs/sigscheme/src/write.c
===================================================================
--- branches/r5rs/sigscheme/src/write.c 2006-02-01 01:49:34 UTC (rev 3055)
+++ branches/r5rs/sigscheme/src/write.c 2006-02-01 03:43:38 UTC (rev 3056)
@@ -31,6 +31,9 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
+
+#include "config.h"
+
/*=======================================
System Include
=======================================*/
More information about the uim-commit
mailing list