* Makefile.am (libguile_la_SOURCES): Remove backtrace.c, debug.c,

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

diff --git a/libguile/weaks.h b/libguile/weaks.h
index 98e1cb6..8a6eb46 100644 (file)
--- a/libguile/weaks.h
+++ b/libguile/weaks.h
@@ -44,7 +44,7 @@
  */
 \f
 
-#include "__scm.h"
+#include "libguile/__scm.h"
 
 \f
 
@@ -56,31 +56,16 @@
 #define SCM_IS_WHVEC_ANY(X) (SCM_VELTS(X)[-1])
 
 \f
-#ifdef __STDC__
-extern SCM scm_make_weak_vector (SCM k, SCM fill);
-extern SCM scm_weak_vector (SCM l);
-extern SCM scm_weak_vector_p (SCM x);
-extern SCM scm_make_weak_hash_table (SCM k);
-extern SCM scm_make_weak_value_hash_table (SCM k);
-extern SCM scm_make_doubly_weak_hash_table (SCM k);
-extern SCM scm_weak_hash_table_p (SCM x);
-extern SCM scm_weak_value_hash_table_p (SCM x);
-extern SCM scm_doubly_weak_hash_table_p (SCM x);
-extern void scm_init_weaks (void);
-
-#else /* STDC */
-extern SCM scm_make_weak_vector ();
-extern SCM scm_weak_vector ();
-extern SCM scm_weak_vector_p ();
-extern SCM scm_make_weak_hash_table ();
-extern SCM scm_make_weak_value_hash_table ();
-extern SCM scm_make_doubly_weak_hash_table ();
-extern SCM scm_weak_hash_table_p ();
-extern SCM scm_weak_value_hash_table_p ();
-extern SCM scm_doubly_weak_hash_table_p ();
-extern void scm_init_weaks ();
-
-#endif /* STDC */
 
+extern SCM scm_make_weak_vector SCM_P ((SCM k, SCM fill));
+extern SCM scm_weak_vector SCM_P ((SCM l));
+extern SCM scm_weak_vector_p SCM_P ((SCM x));
+extern SCM scm_make_weak_key_hash_table SCM_P ((SCM k));
+extern SCM scm_make_weak_value_hash_table SCM_P ((SCM k));
+extern SCM scm_make_doubly_weak_hash_table SCM_P ((SCM k));
+extern SCM scm_weak_key_hash_table_p SCM_P ((SCM x));
+extern SCM scm_weak_value_hash_table_p SCM_P ((SCM x));
+extern SCM scm_doubly_weak_hash_table_p SCM_P ((SCM x));
+extern void scm_init_weaks SCM_P ((void));
 
 #endif  /* WEAKSH */