Remove the dual-callback scheme for numeric and pointer thread IDs,

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 6786cbd2e0ff7f6afddea8451fa3c87403687b44..bcf597f3efb155e25588afc4fa6c47cc423589d8 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -181,7 +181,7 @@ extern BIO *bio_err;
 #    define apps_shutdown() \
                        do { CONF_modules_unload(1); destroy_ui_method(); \
                        OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \
-                       CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                       CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
                        ERR_free_strings(); COMP_zlib_cleanup();} while(0)
 #  else
 #    define apps_startup() \
@@ -191,7 +191,7 @@ extern BIO *bio_err;
 #    define apps_shutdown() \
                        do { CONF_modules_unload(1); destroy_ui_method(); \
                        OBJ_cleanup(); EVP_cleanup(); \
-                       CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                       CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
                        ERR_free_strings(); } while(0)
 #  endif
 #endif
@@ -294,7 +294,10 @@ int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
 int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
 void free_index(CA_DB *db);
-int index_name_cmp(const char **a, const char **b);
+#define index_name_cmp_noconst(a, b) \
+       index_name_cmp((const CSTRING *)CHECKED_PTR_OF(STRING, a), \
+       (const CSTRING *)CHECKED_PTR_OF(STRING, b))
+int index_name_cmp(const CSTRING *a, const CSTRING *b);
 int parse_yesno(const char *str, int def);
 
 X509_NAME *parse_name(char *str, long chtype, int multirdn);