diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 13:13:13 -0400 |
| commit | 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f (patch) | |
| tree | fe0992fb4cf6f3c2a5d597557552ae69caccbe70 /openssl/crypto/dso/dso_openssl.c | |
| parent | 9073d97eff3f6d3b33450ef3532a826674c7e1e8 (diff) | |
| download | vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.gz vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.bz2 vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.zip | |
Update openssl to version openssl-1.0.1m
Conflicts:
openssl/Makefile
openssl/Makefile.bak
openssl/crypto/cryptlib.c
Diffstat (limited to 'openssl/crypto/dso/dso_openssl.c')
| -rw-r--r-- | openssl/crypto/dso/dso_openssl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/openssl/crypto/dso/dso_openssl.c b/openssl/crypto/dso/dso_openssl.c index b17e8e8e9..087e989e1 100644 --- a/openssl/crypto/dso/dso_openssl.c +++ b/openssl/crypto/dso/dso_openssl.c @@ -1,6 +1,7 @@ /* dso_openssl.c */ -/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL - * project 2000. +/* + * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project + * 2000. */ /* ==================================================================== * Copyright (c) 2000 The OpenSSL Project. All rights reserved. @@ -10,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -63,21 +64,20 @@ /* We just pinch the method from an appropriate "default" method. */ DSO_METHOD *DSO_METHOD_openssl(void) - { +{ #ifdef DEF_DSO_METHOD - return(DEF_DSO_METHOD()); + return (DEF_DSO_METHOD()); #elif defined(DSO_DLFCN) - return(DSO_METHOD_dlfcn()); + return (DSO_METHOD_dlfcn()); #elif defined(DSO_DL) - return(DSO_METHOD_dl()); + return (DSO_METHOD_dl()); #elif defined(DSO_WIN32) - return(DSO_METHOD_win32()); + return (DSO_METHOD_win32()); #elif defined(DSO_VMS) - return(DSO_METHOD_vms()); + return (DSO_METHOD_vms()); #elif defined(DSO_BEOS) - return(DSO_METHOD_beos()); + return (DSO_METHOD_beos()); #else - return(DSO_METHOD_null()); + return (DSO_METHOD_null()); #endif - } - +} |