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

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

diff --git a/libguile/smob.h b/libguile/smob.h
index 99d1bfd..b009920 100644 (file)
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -44,24 +44,19 @@
  */
 \f
 #include "libguile/__scm.h"
-#include "libguile/params.h"
 
 \f
-
-
-
 typedef struct scm_smobfuns
 {
   SCM (*mark) SCM_P ((SCM));
   scm_sizet (*free) SCM_P ((SCM));
-  int (*print) SCM_P ((SCM exp, SCM port, int writing));
+  int (*print) SCM_P ((SCM exp, SCM port, scm_print_state *pstate));
   SCM (*equalp) SCM_P ((SCM, SCM));
 } scm_smobfuns;
 
 \f
 
-#define SCM_SMOBNUM(x) (0x0ff & (SCM_CAR(x)>>8));
-#define SCM_PTOBNUM(x) (0x0ff & (SCM_CAR(x)>>8));
+#define SCM_SMOBNUM(x) (0x0ff & (SCM_CAR(x)>>8))
 
 extern scm_sizet scm_numsmob;
 extern scm_smobfuns *scm_smobs;
@@ -71,13 +66,12 @@ extern scm_smobfuns *scm_smobs;
 /* Everyone who uses smobs needs to print.  */
 #include "libguile/ports.h"
 #include "libguile/genio.h"
-#include "libguile/print.h"
 
 /* ... and they all need to GC.  */
 #include "libguile/markers.h"
 
 \f
-extern long scm_newsmob PROTO ((scm_smobfuns *smob));
-extern void scm_smob_prehistory PROTO ((void));
+extern long scm_newsmob SCM_P ((scm_smobfuns *smob));
+extern void scm_smob_prehistory SCM_P ((void));
 
 #endif  /* SMOBH */