[uim-commit] r1923 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-11-01 01:36:47 -0800 (Tue, 01 Nov 2005)
New Revision: 1923

Modified:
   branches/r5rs/sigscheme/sigscheme.h
Log:
* sigscheme/sigscheme.h
  - (SCM_CHARPORT_ERROR, SCM_BYTEPORT_ERROR): New macro to override
    same-named one defined in baseport.h


Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-11-01 09:21:43 UTC (rev 1922)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-11-01 09:36:47 UTC (rev 1923)
@@ -51,9 +51,6 @@
 =======================================*/
 #include "config.h"
 #include "encoding.h"
-#if SCM_USE_NEWPORT
-#include "baseport.h"
-#endif
 
 /*=======================================
    Macro Declarations
@@ -131,6 +128,9 @@
  * Port I/O Handling macros
  */
 #if SCM_USE_NEWPORT
+#define SCM_CHARPORT_ERROR(cport, msg) (SigScm_Error(msg))
+#define SCM_BYTEPORT_ERROR(bport, msg) (SigScm_Error(msg))
+
 #define SCM_ASSERT_LIVE_PORT(port)                                           \
     (SCM_PORT_IMPL(port)                                                     \
      || (SigScm_ErrorObj("operated on closed port", port), 1))
@@ -163,6 +163,14 @@
 #define SCM_PORT_UNGETC(port, c)
 #define SCM_PORT_PRINT SCM_PORT_PUTS
 
+/*
+ * SCM_CHARPORT_ERROR and SCM_BYTEPORT_ERROR must be defined before this
+ * inclusion
+ */
+#if SCM_USE_NEWPORT
+#include "baseport.h"
+#endif
+
 #else /* SCM_USE_NEWPORT */
 
 #define SCM_PORT_GETC(port, c)                  \