resolve conflicts

1 files changed, 4 insertions, 1 deletions

diff --git a/src/lib/libcrypto/rand/randtest.c b/src/lib/libcrypto/rand/randtest.c
index 701932e6ee..9e92a70b03 100644
--- a/src/lib/libcrypto/rand/randtest.c
+++ b/src/lib/libcrypto/rand/randtest.c
@@ -65,7 +65,7 @@
 /* some FIPS 140-1 random number test */
 /* some simple tests */
 
-int main()
+int main(int argc,char **argv)
         {
         unsigned char buf[2500];
         int i,j,k,s,sign,nsign,err=0;
@@ -211,6 +211,9 @@ int main()
         printf("test 4 done\n");
  err:
         err=((err)?1:0);
+#ifdef OPENSSL_SYS_NETWARE
+    if (err) printf("ERROR: %d\n", err);
+#endif
         EXIT(err);
         return(err);
         }