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/vms_rms.h | |
| 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/vms_rms.h')
| -rw-r--r-- | openssl/crypto/vms_rms.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/openssl/crypto/vms_rms.h b/openssl/crypto/vms_rms.h index 00a00d993..09c280e87 100644 --- a/openssl/crypto/vms_rms.h +++ b/openssl/crypto/vms_rms.h @@ -17,15 +17,15 @@ # if __INITIAL_POINTER_SIZE == 64 # define NAMX_DNA_FNA_SET(fab) fab.fab$l_dna = (__char_ptr32) -1; \ fab.fab$l_fna = (__char_ptr32) -1; -# else /* __INITIAL_POINTER_SIZE == 64 */ +# else /* __INITIAL_POINTER_SIZE == 64 */ # define NAMX_DNA_FNA_SET(fab) fab.fab$l_dna = (char *) -1; \ fab.fab$l_fna = (char *) -1; -# endif /* __INITIAL_POINTER_SIZE == 64 [else] */ +# endif /* __INITIAL_POINTER_SIZE == 64 [else] */ # define NAMX_MAXRSS NAML$C_MAXRSS # define NAMX_STRUCT NAML -#else /* def NAML$C_MAXRSS */ +#else /* def NAML$C_MAXRSS */ # define CC_RMS_NAMX cc$rms_nam # define FAB_NAMX fab$l_nam @@ -43,9 +43,8 @@ # define NAMX_STRUCT NAM # ifdef NAM$M_NO_SHORT_UPCASE # define SET_NAMX_NO_SHORT_UPCASE( nam) naml.naml$v_no_short_upcase = 1 -# else /* def NAM$M_NO_SHORT_UPCASE */ +# else /* def NAM$M_NO_SHORT_UPCASE */ # define SET_NAMX_NO_SHORT_UPCASE( nam) -# endif /* def NAM$M_NO_SHORT_UPCASE [else] */ - -#endif /* def NAML$C_MAXRSS [else] */ +# endif /* def NAM$M_NO_SHORT_UPCASE [else] */ +#endif /* def NAML$C_MAXRSS [else] */ |