Commit a5bc1e85 authored by Richard Levitte's avatar Richard Levitte
Browse files

Use e_os2.h rather than opensslconf.h, since some needed macros are 

defined there.
parent c38171ba

crypto/bio/bss_log.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
#include <stdio.h>

#include <errno.h>



#include <openssl/opensslconf.h>

#include <openssl/e_os2.h>



#if defined(OPENSSL_SYS_WIN32)

#  include <process.h>

crypto/bn/bn.h

+1 −1
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ 
#ifndef HEADER_BN_H

#define HEADER_BN_H



#include <openssl/e_os2.h>

#ifndef OPENSSL_NO_FP_API

#include <stdio.h> /* FILE */

#endif

#include <openssl/opensslconf.h>



#ifdef  __cplusplus

extern "C" {

crypto/des/des_locl.h

+2 −2
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 
#ifndef HEADER_DES_LOCL_H

#define HEADER_DES_LOCL_H



#include <openssl/e_os2.h>



#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)

#ifndef OPENSSL_SYS_MSDOS

#define OPENSSL_SYS_MSDOS
@@ -68,8 +70,6 @@ 
#include <stdio.h>

#include <stdlib.h>



#include <openssl/opensslconf.h>



#ifndef OPENSSL_SYS_MSDOS

#if !defined(OPENSSL_SYS_VMS) || defined(__DECC)

#ifdef OPENSSL_UNISTD

crypto/des/destest.c

+4 −3
Original line number Diff line number Diff line
@@ -56,15 +56,16 @@ 
 * [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)

#ifndef OPENSSL_SYS_MSDOS

#define OPENSSL_SYS_MSDOS

#endif

#endif



#include <stdio.h>

#include <stdlib.h>

#include <openssl/opensslconf.h>

#ifndef OPENSSL_SYS_MSDOS

#if !defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VMS_DECC)

#include OPENSSL_UNISTD

crypto/des/read_pwd.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
 * [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)

#ifdef OPENSSL_UNISTD

# include OPENSSL_UNISTD