Use e_os2.h rather than opensslconf.h, since some needed macros are
defined there.
This commit is contained in:
parent
c38171ba1f
commit
a5bc1e8568
@ -66,7 +66,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <openssl/opensslconf.h>
|
#include <openssl/e_os2.h>
|
||||||
|
|
||||||
#if defined(OPENSSL_SYS_WIN32)
|
#if defined(OPENSSL_SYS_WIN32)
|
||||||
# include <process.h>
|
# include <process.h>
|
||||||
|
@ -59,10 +59,10 @@
|
|||||||
#ifndef HEADER_BN_H
|
#ifndef HEADER_BN_H
|
||||||
#define HEADER_BN_H
|
#define HEADER_BN_H
|
||||||
|
|
||||||
|
#include <openssl/e_os2.h>
|
||||||
#ifndef OPENSSL_NO_FP_API
|
#ifndef OPENSSL_NO_FP_API
|
||||||
#include <stdio.h> /* FILE */
|
#include <stdio.h> /* FILE */
|
||||||
#endif
|
#endif
|
||||||
#include <openssl/opensslconf.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -59,6 +59,8 @@
|
|||||||
#ifndef HEADER_DES_LOCL_H
|
#ifndef HEADER_DES_LOCL_H
|
||||||
#define HEADER_DES_LOCL_H
|
#define HEADER_DES_LOCL_H
|
||||||
|
|
||||||
|
#include <openssl/e_os2.h>
|
||||||
|
|
||||||
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
|
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
|
||||||
#ifndef OPENSSL_SYS_MSDOS
|
#ifndef OPENSSL_SYS_MSDOS
|
||||||
#define OPENSSL_SYS_MSDOS
|
#define OPENSSL_SYS_MSDOS
|
||||||
@ -68,8 +70,6 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <openssl/opensslconf.h>
|
|
||||||
|
|
||||||
#ifndef OPENSSL_SYS_MSDOS
|
#ifndef OPENSSL_SYS_MSDOS
|
||||||
#if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
|
#if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
|
||||||
#ifdef OPENSSL_UNISTD
|
#ifdef OPENSSL_UNISTD
|
||||||
|
@ -56,15 +56,16 @@
|
|||||||
* [including the GNU Public Licence.]
|
* [including the GNU Public Licence.]
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <openssl/e_os2.h>
|
||||||
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS)
|
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS)
|
||||||
#ifndef OPENSSL_SYS_MSDOS
|
#ifndef OPENSSL_SYS_MSDOS
|
||||||
#define OPENSSL_SYS_MSDOS
|
#define OPENSSL_SYS_MSDOS
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <openssl/opensslconf.h>
|
|
||||||
#ifndef OPENSSL_SYS_MSDOS
|
#ifndef OPENSSL_SYS_MSDOS
|
||||||
#if !defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VMS_DECC)
|
#if !defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VMS_DECC)
|
||||||
#include OPENSSL_UNISTD
|
#include OPENSSL_UNISTD
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
* [including the GNU Public Licence.]
|
* [including the GNU Public Licence.]
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <openssl/opensslconf.h>
|
#include <openssl/e_os2.h>
|
||||||
#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WIN32)
|
#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WIN32)
|
||||||
#ifdef OPENSSL_UNISTD
|
#ifdef OPENSSL_UNISTD
|
||||||
# include OPENSSL_UNISTD
|
# include OPENSSL_UNISTD
|
||||||
|
Loading…
x
Reference in New Issue
Block a user