[uim-commit] r2961 - branches/r5rs/sigscheme/src

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-20 21:27:09 -0800 (Fri, 20 Jan 2006)
New Revision: 2961

Modified:
   branches/r5rs/sigscheme/src/config.h
   branches/r5rs/sigscheme/src/sigscheme.h
Log:
* sigscheme/src/config.h
  - Exclude my-stdint.h
  - (SCM_FULLY_ADDRESSABLEP): Move to sigscheme.h
  - (SCM_DEFAULT_N_HEAPS_MAX):
    * Undef
    * Move the code to sigscheme.h
* sigscheme/src/sigscheme.h
  - (SCM_FULLY_ADDRESSABLEP, SCM_DEFAULT_N_HEAPS_MAX): Moved from
    config.h


Modified: branches/r5rs/sigscheme/src/config.h
===================================================================
--- branches/r5rs/sigscheme/src/config.h	2006-01-21 04:21:05 UTC (rev 2960)
+++ branches/r5rs/sigscheme/src/config.h	2006-01-21 05:27:09 UTC (rev 2961)
@@ -38,8 +38,6 @@
 #  include "../config.h"
 #endif
 
-#include "my-stdint.h"
-
 /*===========================================================================
   Optional Features Written in C
 ===========================================================================*/
@@ -105,14 +103,9 @@
 #define SCM_LBUF_F_STRING scm_lbuf_f_linear
 #define SCM_LBUF_F_SYMBOL scm_lbuf_f_linear
 
-#define SCM_FULLY_ADDRESSABLEP                                               \
-    (SCM_PTR_BITS == (sizeof(void *) * CHAR_BIT))
-
 #define SCM_DEFAULT_HEAP_SIZE            0x4000
 #define SCM_DEFAULT_HEAP_ALLOC_THRESHOLD (SCM_DEFAULT_HEAP_SIZE / 2)
-#define SCM_DEFAULT_N_HEAPS_MAX                                              \
-    (((SCM_FULLY_ADDRESSABLEP) ? (uintptr_t)-1 : (1 << SCM_PTR_BITS))        \
-     / (SCM_DEFAULT_HEAP_SIZE * sizeof(ScmCell)))
+#undef  SCM_DEFAULT_N_HEAPS_MAX
 #define SCM_DEFAULT_N_HEAPS_INIT         1
 #define SCM_DEFAULT_SYMBOL_HASH_SIZE     0x400
 

Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h	2006-01-21 04:21:05 UTC (rev 2960)
+++ branches/r5rs/sigscheme/src/sigscheme.h	2006-01-21 05:27:09 UTC (rev 2961)
@@ -636,6 +636,15 @@
     size_t symbol_hash_size;      /* hash size of symbol table */
 };
 
+#define SCM_FULLY_ADDRESSABLEP                                               \
+    (SCM_PTR_BITS == (sizeof(void *) * CHAR_BIT))
+
+#ifndef SCM_DEFAULT_N_HEAPS_MAX
+#define SCM_DEFAULT_N_HEAPS_MAX                                              \
+    (((SCM_FULLY_ADDRESSABLEP) ? (uintptr_t)-1 : (1 << SCM_PTR_BITS))        \
+     / (SCM_DEFAULT_HEAP_SIZE * sizeof(ScmCell)))
+#endif
+
 /*=======================================
   Object Representation Information
 =======================================*/