make update

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

diff --git a/crypto/txt_db/txt_db.h b/crypto/txt_db/txt_db.h
index e530af66051a6954fcacf4d26ed327e55463ee60..307e1ba23fc215e038fc651fd5aea24189103718 100644 (file)
--- a/crypto/txt_db/txt_db.h
+++ b/crypto/txt_db/txt_db.h
@@ -59,7 +59,8 @@
 #ifndef HEADER_TXT_DB_H
 #define HEADER_TXT_DB_H
 
-#ifndef NO_BIO
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
 #include <openssl/stack.h>
@@ -81,21 +82,21 @@ typedef struct txt_db_st
        int num_fields;
        STACK /* char ** */ *data;
        LHASH **index;
-       int (**qual)();
+       int (**qual)(char **);
        long error;
        long arg1;
        long arg2;
        char **arg_row;
        } TXT_DB;
 
-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO
 TXT_DB *TXT_DB_read(BIO *in, int num);
 long TXT_DB_write(BIO *out, TXT_DB *db);
 #else
 TXT_DB *TXT_DB_read(char *in, int num);
 long TXT_DB_write(char *out, TXT_DB *db);
 #endif
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(),
+int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(char **),
                LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
 void TXT_DB_free(TXT_DB *db);
 char **TXT_DB_get_by_index(TXT_DB *db, int idx, char **value);