diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
| commit | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (patch) | |
| tree | 6b4b6de1185b25f8e6071b3204fcb69762bdc0ac /openssl/e_os2.h | |
| parent | 40bdd8b27f5c730b8d0c9a189e89fb51a5400611 (diff) | |
| parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
| download | vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.gz vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.bz2 vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/e_os2.h')
| -rw-r--r-- | openssl/e_os2.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/openssl/e_os2.h b/openssl/e_os2.h index 4c785c62c..d30724d30 100644 --- a/openssl/e_os2.h +++ b/openssl/e_os2.h @@ -193,8 +193,14 @@ extern "C" { #endif /* --------------------------------- VOS ----------------------------------- */ -#ifdef OPENSSL_SYSNAME_VOS +#if defined(__VOS__) || defined(OPENSSL_SYSNAME_VOS) # define OPENSSL_SYS_VOS +#ifdef __HPPA__ +# define OPENSSL_SYS_VOS_HPPA +#endif +#ifdef __IA32__ +# define OPENSSL_SYS_VOS_IA32 +#endif #endif /* ------------------------------- VxWorks --------------------------------- */ |