Merge from the main trunk and a 'make update'.

2000-09-17 15:56:27 +00:00
parent 8de7587e02
commit ebcdd0c43e
10 changed files with 51 additions and 25 deletions
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -111,7 +111,7 @@ err:

 STACK *sk_new_null(void)
 	{
-	return sk_new((int (*)(const char * const *, const char * const *))NULL);
+	return sk_new((int (*)(const char * const *, const char * const *))0);
 	}

 STACK *sk_new(int (*c)(const char * const *, const char * const *))