After the latest round of header-hacking, regenerate the dependencies in

[openssl.git] / crypto / lhash / lhash.h

diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h
index 5e3fde5ae44241d1f3a11b0f3a8c4de2aa81c5f5..d392d0cd80d7fc89a0061353f0faf2f334d55666 100644 (file)
--- a/crypto/lhash/lhash.h
+++ b/crypto/lhash/lhash.h
@@ -63,11 +63,12 @@
 #ifndef HEADER_LHASH_H
 #define HEADER_LHASH_H
 
-#ifndef NO_FP_API
+#include <openssl/e_os2.h>
+#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
 #endif
 
-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
 
@@ -79,13 +80,13 @@ typedef struct lhash_node_st
        {
        void *data;
        struct lhash_node_st *next;
-#ifndef NO_HASH_COMP
+#ifndef OPENSSL_NO_HASH_COMP
        unsigned long hash;
 #endif
        } LHASH_NODE;
 
-typedef int (*LHASH_COMP_FN_TYPE)(void *, void *);
-typedef unsigned long (*LHASH_HASH_FN_TYPE)(void *);
+typedef int (*LHASH_COMP_FN_TYPE)(const void *, const void *);
+typedef unsigned long (*LHASH_HASH_FN_TYPE)(const void *);
 typedef void (*LHASH_DOALL_FN_TYPE)(void *);
 typedef void (*LHASH_DOALL_ARG_FN_TYPE)(void *, void *);
 
@@ -94,30 +95,46 @@ typedef void (*LHASH_DOALL_ARG_FN_TYPE)(void *, void *);
  * pointer casting and the macro-defined callbacks provide per-variable casting
  * before deferring to the underlying type-specific callbacks. NB: It is
  * possible to place a "static" in front of both the DECLARE and IMPLEMENT
- * macros if the functions are strictly internal. To keep text-editors happy,
- * the macro deliberately doesn't define a trailing semi-colon - so the macro
- * can be placed just like a regular function declaration, with an optional
- * "static" prefix and trailing simi-colon. */
+ * macros if the functions are strictly internal. */
 
 /* First: "hash" functions */
 #define DECLARE_LHASH_HASH_FN(f_name,o_type) \
-       unsigned long f_name##_LHASH_HASH(void *)
+       unsigned long f_name##_LHASH_HASH(const void *);
 #define IMPLEMENT_LHASH_HASH_FN(f_name,o_type) \
-       unsigned long f_name##_LHASH_HASH(void *arg) { \
+       unsigned long f_name##_LHASH_HASH(const void *arg) { \
                o_type a = (o_type)arg; \
                return f_name(a); }
 #define LHASH_HASH_FN(f_name) f_name##_LHASH_HASH
 
 /* Second: "compare" functions */
 #define DECLARE_LHASH_COMP_FN(f_name,o_type) \
-       int f_name##_LHASH_COMP(void *, void *)
+       int f_name##_LHASH_COMP(const void *, const void *);
 #define IMPLEMENT_LHASH_COMP_FN(f_name,o_type) \
-       int f_name##_LHASH_COMP(void *arg1, void *arg2) { \
+       int f_name##_LHASH_COMP(const void *arg1, const void *arg2) { \
                o_type a = (o_type)arg1; \
                o_type b = (o_type)arg2; \
                return f_name(a,b); }
 #define LHASH_COMP_FN(f_name) f_name##_LHASH_COMP
 
+/* Third: "doall" functions */
+#define DECLARE_LHASH_DOALL_FN(f_name,o_type) \
+       void f_name##_LHASH_DOALL(void *);
+#define IMPLEMENT_LHASH_DOALL_FN(f_name,o_type) \
+       void f_name##_LHASH_DOALL(void *arg) { \
+               o_type a = (o_type)arg; \
+               f_name(a); }
+#define LHASH_DOALL_FN(f_name) f_name##_LHASH_DOALL
+
+/* Fourth: "doall_arg" functions */
+#define DECLARE_LHASH_DOALL_ARG_FN(f_name,o_type,a_type) \
+       void f_name##_LHASH_DOALL_ARG(void *, void *);
+#define IMPLEMENT_LHASH_DOALL_ARG_FN(f_name,o_type,a_type) \
+       void f_name##_LHASH_DOALL_ARG(void *arg1, void *arg2) { \
+               o_type a = (o_type)arg1; \
+               a_type b = (a_type)arg2; \
+               f_name(a,b); }
+#define LHASH_DOALL_ARG_FN(f_name) f_name##_LHASH_DOALL_ARG
+
 typedef struct lhash_st
        {
        LHASH_NODE **b;
@@ -157,20 +174,20 @@ typedef struct lhash_st
 LHASH *lh_new(LHASH_HASH_FN_TYPE h, LHASH_COMP_FN_TYPE c);
 void lh_free(LHASH *lh);
 void *lh_insert(LHASH *lh, void *data);
-void *lh_delete(LHASH *lh, void *data);
-void *lh_retrieve(LHASH *lh, void *data);
+void *lh_delete(LHASH *lh, const void *data);
+void *lh_retrieve(LHASH *lh, const void *data);
 void lh_doall(LHASH *lh, LHASH_DOALL_FN_TYPE func);
 void lh_doall_arg(LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
 unsigned long lh_strhash(const char *c);
 unsigned long lh_num_items(const LHASH *lh);
 
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 void lh_stats(const LHASH *lh, FILE *out);
 void lh_node_stats(const LHASH *lh, FILE *out);
 void lh_node_usage_stats(const LHASH *lh, FILE *out);
 #endif
 
-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO
 void lh_stats_bio(const LHASH *lh, BIO *out);
 void lh_node_stats_bio(const LHASH *lh, BIO *out);
 void lh_node_usage_stats_bio(const LHASH *lh, BIO *out);