diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2014-04-13 15:25:36 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-04-13 15:25:36 +0000 |
commit | 84c7bd789732635adc8c671d7050078c85d01b9d (patch) | |
tree | cf5e8df1672e76e3ba71dc0c73b39ab8a02e95b0 /lib/libcrypto/objects | |
parent | 7beea9a356f8a5b214ed72826b421519e188cf83 (diff) |
Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.
Diffstat (limited to 'lib/libcrypto/objects')
-rw-r--r-- | lib/libcrypto/objects/o_names.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/objects/o_names.c b/lib/libcrypto/objects/o_names.c index 84380a96a98..4a548c2ed49 100644 --- a/lib/libcrypto/objects/o_names.c +++ b/lib/libcrypto/objects/o_names.c @@ -73,7 +73,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *), name_funcs_stack=sk_NAME_FUNCS_new_null(); MemCheck_on(); } - if ((name_funcs_stack == NULL)) + if (name_funcs_stack == NULL) { /* ERROR */ return(0); |