projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create branch 'utf-2000'.
[chise/xemacs-chise.git-]
/
src
/
hash.h
diff --git
a/src/hash.h
b/src/hash.h
index
e55eb85
..
4e4787c
100644
(file)
--- a/
src/hash.h
+++ b/
src/hash.h
@@
-17,17
+17,17
@@
Boston, MA 02111-1307, USA. */
/* Synched up with: Not in FSF. */
/* Synched up with: Not in FSF. */
-#ifndef _HASH_H_
-#define _HASH_H_
+#ifndef INCLUDED_hash_h_
+#define INCLUDED_hash_h_
typedef struct
{
typedef struct
{
- CONST void *key;
+ const void *key;
void *contents;
} hentry;
void *contents;
} hentry;
-typedef int (*hash_table_test_function) (CONST void *, CONST void *);
-typedef unsigned long (*hash_table_hash_function) (CONST void *);
+typedef int (*hash_table_test_function) (const void *, const void *);
+typedef unsigned long (*hash_table_hash_function) (const void *);
typedef size_t hash_size_t;
struct hash_table
typedef size_t hash_size_t;
struct hash_table
@@
-57,18
+57,18
@@
void clrhash (struct hash_table *hash_table);
void free_hash_table (struct hash_table *hash_table);
/* Returns a hentry whose key is 0 if the entry does not exist in HASH-TABLE */
void free_hash_table (struct hash_table *hash_table);
/* Returns a hentry whose key is 0 if the entry does not exist in HASH-TABLE */
-CONST void *gethash (CONST void *key, struct hash_table *hash_table,
- CONST void **ret_value);
+const void *gethash (const void *key, struct hash_table *hash_table,
+ const void **ret_value);
/* KEY should be different from 0 */
/* KEY should be different from 0 */
-void puthash (CONST void *key, void *contents, struct hash_table *hash_table);
+void puthash (const void *key, void *contents, struct hash_table *hash_table);
/* delete the entry with key KEY */
/* delete the entry with key KEY */
-void remhash (CONST void *key, struct hash_table *hash_table);
+void remhash (const void *key, struct hash_table *hash_table);
-typedef int (*maphash_function) (CONST void* key, void* contents, void* arg);
+typedef int (*maphash_function) (const void* key, void* contents, void* arg);
-typedef int (*remhash_predicate) (CONST void* key, CONST void* contents,
+typedef int (*remhash_predicate) (const void* key, const void* contents,
void* arg);
/* Call MF (key, contents, arg) for every entry in HASH-TABLE */
void* arg);
/* Call MF (key, contents, arg) for every entry in HASH-TABLE */
@@
-78,4
+78,4
@@
void maphash (maphash_function mf, struct hash_table *hash_table, void* arg);
void map_remhash (remhash_predicate predicate,
struct hash_table *hash_table, void *arg);
void map_remhash (remhash_predicate predicate,
struct hash_table *hash_table, void *arg);
-#endif /* _HASH_H_ */
+#endif /* INCLUDED_hash_h_ */