X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/0f2d19dd46f83f41177f61d585732b32a866d613..ab256d39098ffb1ac986290bde36c9713d0f262e:/libguile/weaks.c

diff --git a/libguile/weaks.c b/libguile/weaks.c
index 8479d76f5..5a79c8591 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -12,7 +12,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, Free Software Foundation gives permission
  * for additional uses of the text contained in its release of this library.
@@ -36,12 +37,12 @@
  *
  * If you write modifications of your own for this library, 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.  */
 
 #include <stdio.h>
 #include "_scm.h"
 
+#include "weaks.h"
 
 
 
@@ -50,15 +51,11 @@
 
 
 SCM_PROC(s_make_weak_vector, "make-weak-vector", 1, 1, 0, scm_make_weak_vector);
-#ifdef __STDC__
-SCM
-scm_make_weak_vector (SCM k, SCM fill)
-#else
+
 SCM
 scm_make_weak_vector (k, fill)
      SCM k;
      SCM fill;
-#endif
 {
   SCM v;
   v = scm_make_vector (scm_sum (k, SCM_MAKINUM (1)), fill, SCM_UNDEFINED);
@@ -73,14 +70,10 @@ scm_make_weak_vector (k, fill)
 
 SCM_PROC(s_weak_vector, "weak-vector", 0, 0, 1, scm_weak_vector);
 SCM_PROC(s_list_to_weak_vector, "list->weak-vector", 1, 0, 0, scm_weak_vector);
-#ifdef __STDC__
-SCM
-scm_weak_vector (SCM l)
-#else
+
 SCM
 scm_weak_vector (l)
      SCM l;
-#endif
 {
   SCM res;
   register SCM *data;
@@ -99,14 +92,10 @@ scm_weak_vector (l)
 
 
 SCM_PROC(s_weak_vector_p, "weak-vector?", 1, 0, 0, scm_weak_vector_p);
-#ifdef __STDC__
-SCM
-scm_weak_vector_p (SCM x)
-#else
+
 SCM
 scm_weak_vector_p (x)
      SCM x;
-#endif
 {
   return ((SCM_NIMP (x) && SCM_WVECTP (x) && !SCM_IS_WHVEC (x))
 	  ? SCM_BOOL_T
@@ -119,18 +108,14 @@ scm_weak_vector_p (x)
 
 
 
-SCM_PROC(s_make_weak_hash_table, "make-weak-hash-table", 1, 0, 0, scm_make_weak_hash_table);
-#ifdef __STDC__
-SCM
-scm_make_weak_hash_table (SCM k)
-#else
+SCM_PROC(s_make_weak_key_hash_table, "make-weak-key-hash-table", 1, 0, 0, scm_make_weak_key_hash_table);
+
 SCM
-scm_make_weak_hash_table (k)
+scm_make_weak_key_hash_table (k)
      SCM k;
-#endif
 {
   SCM v;
-  SCM_ASSERT (SCM_INUMP (k), k, SCM_ARG1, s_make_weak_hash_table);
+  SCM_ASSERT (SCM_INUMP (k), k, SCM_ARG1, s_make_weak_key_hash_table);
   v = scm_make_weak_vector (k, SCM_EOL);
   SCM_ALLOW_INTS;
   SCM_VELTS (v)[-1] = 1;
@@ -140,14 +125,10 @@ scm_make_weak_hash_table (k)
 
 
 SCM_PROC (s_make_weak_value_hash_table, "make-weak-value-hash-table", 1, 0, 0, scm_make_weak_value_hash_table);
-#ifdef __STDC__
-SCM
-scm_make_weak_value_hash_table (SCM k)
-#else
+
 SCM
 scm_make_weak_value_hash_table (k)
      SCM k;
-#endif
 {
   SCM v;
   SCM_ASSERT (SCM_INUMP (k), k, SCM_ARG1, s_make_weak_value_hash_table);
@@ -161,17 +142,13 @@ scm_make_weak_value_hash_table (k)
 
 
 SCM_PROC (s_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 1, 0, 0, scm_make_doubly_weak_hash_table);
-#ifdef __STDC__
-SCM
-scm_make_doubly_weak_hash_table (SCM k)
-#else
+
 SCM
 scm_make_doubly_weak_hash_table (k)
      SCM k;
-#endif
 {
   SCM v;
-  SCM_ASSERT (SCM_INUMP (k), k, SCM_ARG1, s_make_weak_value_hash_table);
+  SCM_ASSERT (SCM_INUMP (k), k, SCM_ARG1, s_make_doubly_weak_hash_table);
   v = scm_make_weak_vector (k, SCM_EOL);
   SCM_ALLOW_INTS;
   SCM_VELTS (v)[-1] = 3;
@@ -179,15 +156,11 @@ scm_make_doubly_weak_hash_table (k)
   return v;
 }
 
-SCM_PROC(s_weak_hash_table_p, "weak-hash-table?", 1, 0, 0, scm_weak_hash_table_p);
-#ifdef __STDC__
-SCM
-scm_weak_hash_table_p (SCM x)
-#else
+SCM_PROC(s_weak_key_hash_table_p, "weak-key-hash-table?", 1, 0, 0, scm_weak_key_hash_table_p);
+
 SCM
-scm_weak_hash_table_p (x)
+scm_weak_key_hash_table_p (x)
      SCM x;
-#endif
 {
   return ((SCM_NIMP (x) && SCM_WVECTP (x) && SCM_IS_WHVEC(x))
 	  ? SCM_BOOL_T
@@ -196,14 +169,10 @@ scm_weak_hash_table_p (x)
 
 
 SCM_PROC (s_weak_value_hash_table_p, "weak-value-hash-table?", 1, 0, 0, scm_weak_value_hash_table_p);
-#ifdef __STDC__
-SCM
-scm_weak_value_hash_table_p (SCM x)
-#else
+
 SCM
 scm_weak_value_hash_table_p (x)
      SCM x;
-#endif
 {
   return ((SCM_NIMP (x) && SCM_WVECTP (x) && SCM_IS_WHVEC_V(x))
 	  ? SCM_BOOL_T
@@ -212,14 +181,10 @@ scm_weak_value_hash_table_p (x)
 
 
 SCM_PROC (s_doubly_weak_hash_table_p, "doubly-weak-hash-table?", 1, 0, 0, scm_doubly_weak_hash_table_p);
-#ifdef __STDC__
-SCM
-scm_doubly_weak_hash_table_p (SCM x)
-#else
+
 SCM
 scm_doubly_weak_hash_table_p (x)
      SCM x;
-#endif
 {
   return ((SCM_NIMP (x) && SCM_WVECTP (x) && SCM_IS_WHVEC_B (x))
 	  ? SCM_BOOL_T
@@ -229,13 +194,9 @@ scm_doubly_weak_hash_table_p (x)
 
 
 
-#ifdef __STDC__
-void
-scm_init_weaks (void)
-#else
+
 void
 scm_init_weaks ()
-#endif
 {
 #include "weaks.x"
 }