Commit 677963e5 authored by Pauli's avatar Pauli
Browse files

e_os.h removal from other headers and source files. 



Removed e_os.h from all bar three headers (apps/apps.h crypto/bio/bio_lcl.h and
ssl/ssl_locl.h).

Added e_os.h into the files that need it now.

Directly reference internal/nelem.h when required.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)
parent 58891025

apps/apps.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -10,6 +10,7 @@ 
#ifndef HEADER_APPS_H

# define HEADER_APPS_H



# include "internal/nelem.h"

# include "e_os.h"

# if defined(__unix) || defined(__unix__)

#  include <sys/time.h> /* struct timeval for DTLS */

crypto/asn1/ameth_lib.c

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -7,8 +7,9 @@ 
 * https://www.openssl.org/source/license.html

 */



#include <stdio.h>

#include "e_os.h"               /* for strncasecmp */

#include "internal/cryptlib.h"

#include <stdio.h>

#include <openssl/asn1t.h>

#include <openssl/x509.h>

#include <openssl/engine.h>

crypto/asn1/tasn_utl.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -10,6 +10,7 @@ 
#include <stddef.h>

#include <string.h>

#include "internal/cryptlib.h"

#include "e_os.h"

#include <openssl/asn1.h>

#include <openssl/asn1t.h>

#include <openssl/objects.h>

crypto/async/arch/async_posix.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#  include <ucontext.h>

#  include <setjmp.h>

#  include "e_os.h"



typedef struct async_fibre_st {

    ucontext_t fibre;

crypto/blake2/blake2_impl.h

+1 −2
Original line number Diff line number Diff line 
/*

 * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -15,7 +15,6 @@ 
 */



#include <string.h>

#include "e_os.h"



static ossl_inline uint32_t load32(const uint8_t *src)

{