Include e_os.h correctly.

[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 58b9de13532c1420d4ec5b1011b96c53bf714362..563392aeff11dbf97c8e32f174143af8dd781191 100644 (file)
--- a/crypto/txt_db/txt_db.h
+++ b/crypto/txt_db/txt_db.h
@@ -59,10 +59,9 @@
 #ifndef HEADER_TXT_DB_H
 #define HEADER_TXT_DB_H
 
-#ifdef  __cplusplus
-extern "C" {
+#ifndef OPENSSL_NO_BIO
+#include <openssl/bio.h>
 #endif
-
 #include <openssl/stack.h>
 #include <openssl/lhash.h>
 
@@ -73,6 +72,10 @@ extern "C" {
 #define DB_ERROR_NO_INDEX              4
 #define DB_ERROR_INSERT_INDEX_CLASH            5
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct txt_db_st
        {
        int num_fields;
@@ -85,7 +88,7 @@ typedef struct txt_db_st
        char **arg_row;
        } TXT_DB;
 
-#ifdef HEADER_BIO_H
+#ifndef OPENSSL_NO_BIO
 TXT_DB *TXT_DB_read(BIO *in, int num);
 long TXT_DB_write(BIO *out, TXT_DB *db);
 #else
@@ -93,7 +96,7 @@ 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)(),
-        unsigned long (*hash)(),int (*cmp)());
+               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);
 int TXT_DB_insert(TXT_DB *db,char **value);