* validate.h (SCM_VALIDATE_OPOUTSTRPORT): New macro.

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

diff --git a/libguile/mallocs.h b/libguile/mallocs.h
index 19fa8e5..e6a3938 100644 (file)
--- a/libguile/mallocs.h
+++ b/libguile/mallocs.h
@@ -2,7 +2,7 @@
 
 #ifndef MALLOCSH
 #define MALLOCSH
-/*     Copyright (C) 1995 Free Software Foundation, Inc.
+/*     Copyright (C) 1995, 2000 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -40,21 +41,26 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 #include "libguile/__scm.h"
 
 \f
-extern int scm_tc16_malloc;
+extern scm_bits_t scm_tc16_malloc;
 
 #define SCM_MALLOCP(X)  (SCM_TYP16 (X) == scm_tc16_malloc)
-#define SCM_MALLOCDATA(obj) ((char *)SCM_CDR(obj))
-#define SCM_SETMALLOCDATA(obj, val) ((char *)SCM_SETCDR(obj, val))
+#define SCM_MALLOCDATA(obj) ((char *) SCM_CELL_WORD_1 (obj))
+#define SCM_SETMALLOCDATA(obj, val) (SCM_SET_CELL_WORD_1 (obj, val))
 
 \f
 
-extern SCM scm_malloc_obj SCM_P ((scm_sizet n));
-extern void scm_init_mallocs SCM_P ((void));
+extern SCM scm_malloc_obj (scm_sizet n);
+extern void scm_init_mallocs (void);
 
 #endif  /* MALLOCSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/