* ports.c (scm_char_ready_p): bug fix: in SCM_PROC char-ready's

[bpt/guile.git] / libguile / extchrs.h

diff --git a/libguile/extchrs.h b/libguile/extchrs.h
index 8d17c46..3f1f022 100644 (file)
--- a/libguile/extchrs.h
+++ b/libguile/extchrs.h
@@ -46,9 +46,11 @@
 
 #include <stdlib.h>
 
-#define FAKE_EXT_SCM_CHARS 1
+#include "libguile/__scm.h"
 
-#if !defined(FAKE_EXT_SCM_CHARS)
+#define SCM_FAKE_EXT_CHARS 1
+
+#if !defined(SCM_FAKE_EXT_CHARS)
 
 #define xmblen mblen
 #define xwctomb wctomb
@@ -63,21 +65,10 @@ typedef unsigned short xwchar_t;
 
 #endif
 
-
 \f
-#ifdef __STDC__
-extern int xmblen (const char * str, size_t size);
-extern int xwctomb (char * _str, int c);
-extern int xmbtowc (xwchar_t * result, const unsigned char * _str, size_t size);
-
-#else /* STDC */
-extern int xmblen ();
-extern int xwctomb ();
-extern int xmbtowc ();
-
-#endif /* STDC */
-
-
 
+extern int xmblen SCM_P ((const char * str, size_t size));
+extern int xwctomb SCM_P ((char * _str, int c));
+extern int xmbtowc SCM_P ((xwchar_t * result, const unsigned char * _str, size_t size));
 
 #endif  /* EXTCHRSH */