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

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index f83bafc7f1ab54682cd5ef0c23fa743babf6690d..1cba9f59256c396fc52e14a741443d16e6dafbd3 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -56,32 +56,27 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_RSA
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "rsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG
 #define PROG genrsa_main
 
-#ifndef NOPROTO
 static void MS_CALLBACK genrsa_cb(int p, int n, char *arg);
 static long gr_load_rand(char *names);
-#else
-static void MS_CALLBACK genrsa_cb();
-static long gr_load_rand();
-#endif
-
 int MAIN(int argc, char **argv)
        {
        int ret=1;
@@ -268,5 +263,4 @@ static long gr_load_rand(char *name)
                }
        return(tot);
        }
-
-
+#endif