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/o_dir.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/o_dir.c')
| -rw-r--r-- | openssl/crypto/o_dir.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/openssl/crypto/o_dir.c b/openssl/crypto/o_dir.c index 42891ea45..26242444c 100644 --- a/openssl/crypto/o_dir.c +++ b/openssl/crypto/o_dir.c @@ -1,6 +1,7 @@ /* crypto/o_dir.c -*- mode:C; c-file-style: "eay" -*- */ -/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL - * project 2004. +/* + * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project + * 2004. */ /* ==================================================================== * Copyright (c) 2004 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 @@ -59,9 +60,11 @@ #include <errno.h> #include <e_os.h> -/* The routines really come from the Levitte Programming, so to make - life simple, let's just use the raw files and hack the symbols to - fit our namespace. */ +/* + * The routines really come from the Levitte Programming, so to make life + * simple, let's just use the raw files and hack the symbols to fit our + * namespace. + */ #define LP_DIR_CTX OPENSSL_DIR_CTX #define LP_dir_context_st OPENSSL_dir_context_st #define LP_find_file OPENSSL_DIR_read @@ -71,13 +74,13 @@ #define LPDIR_H #if defined OPENSSL_SYS_UNIX || defined DJGPP -#include "LPdir_unix.c" +# include "LPdir_unix.c" #elif defined OPENSSL_SYS_VMS -#include "LPdir_vms.c" +# include "LPdir_vms.c" #elif defined OPENSSL_SYS_WIN32 -#include "LPdir_win32.c" +# include "LPdir_win32.c" #elif defined OPENSSL_SYS_WINCE -#include "LPdir_wince.c" +# include "LPdir_wince.c" #else -#include "LPdir_nyi.c" +# include "LPdir_nyi.c" #endif |