Update to last change: include $(srcdir)/ in replaced $< constructs.

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

diff --git a/libguile/hashtab.h b/libguile/hashtab.h
index 345644c..ae1582a 100644 (file)
--- a/libguile/hashtab.h
+++ b/libguile/hashtab.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef HASHTABH
-#define HASHTABH
-/*     Copyright (C) 1995,1996 Free Software Foundation, Inc.
- * 
+#ifndef SCM_HASHTAB_H
+#define SCM_HASHTAB_H
+
+/* Copyright (C) 1995,1996,1999,2000,2001 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
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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, Inc., 59 Temple Place, Suite 330,
@@ -42,43 +43,55 @@
  * 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.  */
+
 \f
+
 #include "libguile/__scm.h"
 
 \f
 
 #if 0
-typedef unsigned int scm_hash_fn_t SCM_P ((SCM obj, unsigned int d, void *closure));
-typedef SCM scm_assoc_fn_t SCM_P ((SCM key, SCM alist, void *closure));
-typedef SCM scm_delete_fn_t SCM_P ((SCM elt, SCM list));
+typedef unsigned int scm_t_hash_fn (SCM obj, unsigned int d, void *closure);
+typedef SCM scm_t_assoc_fn (SCM key, SCM alist, void *closure);
+typedef SCM scm_t_delete_fn (SCM elt, SCM list);
 #endif
 
-extern SCM scm_hash_fn_get_handle SCM_P ((SCM table, SCM obj, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure));
-extern SCM scm_hash_fn_create_handle_x SCM_P ((SCM table, SCM obj, SCM init, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure));
-extern SCM scm_hash_fn_ref SCM_P ((SCM table, SCM obj, SCM dflt, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure));
-extern SCM scm_hash_fn_set_x SCM_P ((SCM table, SCM obj, SCM val, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure));
-extern SCM scm_hash_fn_remove_x SCM_P ((SCM table, SCM obj, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), SCM (*delete_fn) (), void * closure));
+SCM_API SCM scm_c_make_hash_table (unsigned long k);
+
+SCM_API SCM scm_hash_fn_get_handle (SCM table, SCM obj, unsigned long (*hash_fn) (), SCM (*assoc_fn) (), void * closure);
+SCM_API SCM scm_hash_fn_create_handle_x (SCM table, SCM obj, SCM init, unsigned long (*hash_fn) (), SCM (*assoc_fn) (), void * closure);
+SCM_API SCM scm_hash_fn_ref (SCM table, SCM obj, SCM dflt, unsigned long (*hash_fn) (), SCM (*assoc_fn) (), void * closure);
+SCM_API SCM scm_hash_fn_set_x (SCM table, SCM obj, SCM val, unsigned long (*hash_fn) (), SCM (*assoc_fn) (), void * closure);
+SCM_API SCM scm_hash_fn_remove_x (SCM table, SCM obj, unsigned long (*hash_fn) (), SCM (*assoc_fn) (), SCM (*delete_fn) (), void * closure);
+SCM_API SCM scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table);
+
+SCM_API SCM scm_hashq_get_handle (SCM table, SCM obj);
+SCM_API SCM scm_hashq_create_handle_x (SCM table, SCM obj, SCM init);
+SCM_API SCM scm_hashq_ref (SCM table, SCM obj, SCM dflt);
+SCM_API SCM scm_hashq_set_x (SCM table, SCM obj, SCM val);
+SCM_API SCM scm_hashq_remove_x (SCM table, SCM obj);
+SCM_API SCM scm_hashv_get_handle (SCM table, SCM obj);
+SCM_API SCM scm_hashv_create_handle_x (SCM table, SCM obj, SCM init);
+SCM_API SCM scm_hashv_ref (SCM table, SCM obj, SCM dflt);
+SCM_API SCM scm_hashv_set_x (SCM table, SCM obj, SCM val);
+SCM_API SCM scm_hashv_remove_x (SCM table, SCM obj);
+SCM_API SCM scm_hash_get_handle (SCM table, SCM obj);
+SCM_API SCM scm_hash_create_handle_x (SCM table, SCM obj, SCM init);
+SCM_API SCM scm_hash_ref (SCM table, SCM obj, SCM dflt);
+SCM_API SCM scm_hash_set_x (SCM table, SCM obj, SCM val);
+SCM_API SCM scm_hash_remove_x (SCM table, SCM obj);
+SCM_API SCM scm_hashx_get_handle (SCM hash, SCM assoc, SCM table, SCM obj);
+SCM_API SCM scm_hashx_create_handle_x (SCM hash, SCM assoc, SCM table, SCM obj, SCM init);
+SCM_API SCM scm_hashx_ref (SCM hash, SCM assoc, SCM table, SCM obj, SCM dflt);
+SCM_API SCM scm_hashx_set_x (SCM hash, SCM assoc, SCM table, SCM obj, SCM val);
+SCM_API SCM scm_hashx_remove_x (SCM hash, SCM assoc, SCM del, SCM table, SCM obj);
+SCM_API SCM scm_hash_fold (SCM proc, SCM init, SCM hash);
+SCM_API void scm_init_hashtab (void);
 
-extern SCM scm_hashq_get_handle SCM_P ((SCM table, SCM obj));
-extern SCM scm_hashq_create_handle_x SCM_P ((SCM table, SCM obj, SCM init));
-extern SCM scm_hashq_ref SCM_P ((SCM table, SCM obj, SCM dflt));
-extern SCM scm_hashq_set_x SCM_P ((SCM table, SCM obj, SCM val));
-extern SCM scm_hashq_remove_x SCM_P ((SCM table, SCM obj));
-extern SCM scm_hashv_get_handle SCM_P ((SCM table, SCM obj));
-extern SCM scm_hashv_create_handle_x SCM_P ((SCM table, SCM obj, SCM init));
-extern SCM scm_hashv_ref SCM_P ((SCM table, SCM obj, SCM dflt));
-extern SCM scm_hashv_set_x SCM_P ((SCM table, SCM obj, SCM val));
-extern SCM scm_hashv_remove_x SCM_P ((SCM table, SCM obj));
-extern SCM scm_hash_get_handle SCM_P ((SCM table, SCM obj));
-extern SCM scm_hash_create_handle_x SCM_P ((SCM table, SCM obj, SCM init));
-extern SCM scm_hash_ref SCM_P ((SCM table, SCM obj, SCM dflt));
-extern SCM scm_hash_set_x SCM_P ((SCM table, SCM obj, SCM val));
-extern SCM scm_hash_remove_x SCM_P ((SCM table, SCM obj));
-extern SCM scm_hashx_get_handle SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj));
-extern SCM scm_hashx_create_handle_x SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj, SCM init));
-extern SCM scm_hashx_ref SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj, SCM dflt));
-extern SCM scm_hashx_set_x SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj, SCM val));
-extern SCM scm_hashx_remove_x SCM_P ((SCM hash, SCM assoc, SCM del, SCM table, SCM obj));
-extern void scm_init_hashtab SCM_P ((void));
+#endif  /* SCM_HASHTAB_H */
 
-#endif  /* HASHTABH */
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/