It was a very bad idea to use #include "../e_os.h" -- when this occurs

[openssl.git] / apps / progs.h

diff --git a/apps/progs.h b/apps/progs.h
index 216c9d9f2a6c644d5db6c8ae708a01fbb862b715..a37d7e42ffd7ad6c7a5878a3a7a4e99d5d3569c9 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -1,6 +1,5 @@
 /* This file was generated by progs.pl. */
 
-#ifndef NOPROTO
 extern int verify_main(int argc,char *argv[]);
 extern int asn1parse_main(int argc,char *argv[]);
 extern int req_main(int argc,char *argv[]);
@@ -28,35 +27,6 @@ extern int sess_id_main(int argc,char *argv[]);
 extern int ciphers_main(int argc,char *argv[]);
 extern int nseq_main(int argc,char *argv[]);
 extern int pkcs12_main(int argc,char *argv[]);
-#else
-extern int verify_main();
-extern int asn1parse_main();
-extern int req_main();
-extern int dgst_main();
-extern int dh_main();
-extern int enc_main();
-extern int gendh_main();
-extern int errstr_main();
-extern int ca_main();
-extern int crl_main();
-extern int rsa_main();
-extern int dsa_main();
-extern int dsaparam_main();
-extern int x509_main();
-extern int genrsa_main();
-extern int gendsa_main();
-extern int s_server_main();
-extern int s_client_main();
-extern int speed_main();
-extern int s_time_main();
-extern int version_main();
-extern int pkcs7_main();
-extern int crl2pkcs7_main();
-extern int sess_id_main();
-extern int ciphers_main();
-extern int nseq_main();
-extern int pkcs12_main();
-#endif
 
 #ifdef SSLEAY_SRC  /* Defined only in openssl.c. */
 
@@ -145,7 +115,7 @@ FUNCTION functions[] = {
 #ifndef NO_RC2
        {FUNC_TYPE_CIPHER,"rc2",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
        {FUNC_TYPE_CIPHER,"bf",enc_main},
 #endif
 #ifndef NO_CAST
@@ -214,16 +184,16 @@ FUNCTION functions[] = {
 #ifndef NO_RC2
        {FUNC_TYPE_CIPHER,"rc2-ofb",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
        {FUNC_TYPE_CIPHER,"bf-cbc",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
        {FUNC_TYPE_CIPHER,"bf-ecb",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
        {FUNC_TYPE_CIPHER,"bf-cfb",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
        {FUNC_TYPE_CIPHER,"bf-ofb",enc_main},
 #endif
 #ifndef NO_CAST