Move to beta 3.

[openssl.git] / apps / gendh.c

diff --git a/apps/gendh.c b/apps/gendh.c
index 2790f179fdc30d7174f31d90811c35bcbfb65acd..b3c19581d350370dc6df0a80ece47dec90ab6d08 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -56,34 +56,27 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DH
 #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 "dh.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/dh.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG
 #define PROG gendh_main
 
-#ifndef NOPROTO
 static void MS_CALLBACK dh_cb(int p, int n, char *arg);
 static long dh_load_rand(char *names);
-#else
-static void MS_CALLBACK dh_cb();
-static long dh_load_rand();
-#endif
-
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        char buffer[200];
        DH *dh=NULL;
@@ -191,10 +184,7 @@ end:
        EXIT(ret);
        }
 
-static void MS_CALLBACK dh_cb(p,n,arg)
-int p;
-int n;
-char *arg;
+static void MS_CALLBACK dh_cb(int p, int n, char *arg)
        {
        char c='*';
 
@@ -209,8 +199,7 @@ char *arg;
 #endif
        }
 
-static long dh_load_rand(name)
-char *name;
+static long dh_load_rand(char *name)
        {
        char *p,*n;
        int last;
@@ -231,5 +220,4 @@ char *name;
                }
        return(tot);
        }
-
-
+#endif