Commit 4cff10dc authored by Pauli's avatar Pauli
Browse files

struct timeval include guards 



Move struct timeval includes into e_os.h (where the Windows ones were).
Enaure that the include is guarded canonically.

Refer #4271

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4312)
parent 75551e07

apps/apps.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -10,11 +10,8 @@ 
#ifndef HEADER_APPS_H

#ifndef HEADER_APPS_H

# define HEADER_APPS_H

# define HEADER_APPS_H





# include "e_os.h"

# include "e_os.h" /* struct timeval for DTLS */

# include "internal/nelem.h"

# include "internal/nelem.h"

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

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

# endif

# include <assert.h>

# include <assert.h>





# include <openssl/e_os2.h>

# include <openssl/e_os2.h>

crypto/bio/bss_dgram.c

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

/*

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

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

 *

 *

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

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

 * this file except in compliance with the License.  You can obtain a copy

 * this file except in compliance with the License.  You can obtain a copy
@@ -13,10 +13,6 @@ 
#include "bio_lcl.h"

#include "bio_lcl.h"

#ifndef OPENSSL_NO_DGRAM

#ifndef OPENSSL_NO_DGRAM





# if !defined(_WIN32)

#  include <sys/time.h>

# endif



# ifndef OPENSSL_NO_SCTP

# ifndef OPENSSL_NO_SCTP

#  include <netinet/sctp.h>

#  include <netinet/sctp.h>

#  include <fcntl.h>

#  include <fcntl.h>

crypto/ts/ts_rsp_sign.c

+2 −5
Original line number Original line 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

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

 * this file except in compliance with the License.  You can obtain a copy

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

 * https://www.openssl.org/source/license.html

 */

 */





#include "e_os.h"

#include "internal/cryptlib.h"

#include "internal/cryptlib.h"





#if defined(OPENSSL_SYS_UNIX)

# include <sys/time.h>

#endif



#include <openssl/objects.h>

#include <openssl/objects.h>

#include <openssl/ts.h>

#include <openssl/ts.h>

#include <openssl/pkcs7.h>

#include <openssl/pkcs7.h>

e_os.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -234,6 +234,12 @@ extern FILE *_imp___iob; 




# else                          /* The non-microsoft world */

# else                          /* The non-microsoft world */





#  if defined(OPENSSL_SYS_VXWORKS)

#   include <sys/times.h>

#  else

#   include <sys/time.h>

#  endif



#  ifdef OPENSSL_SYS_VMS

#  ifdef OPENSSL_SYS_VMS

#   define VMS 1

#   define VMS 1

  /*

  /*

ssl/d1_lib.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -13,12 +13,6 @@ 
#include <openssl/rand.h>

#include <openssl/rand.h>

#include "ssl_locl.h"

#include "ssl_locl.h"





#if defined(OPENSSL_SYS_VXWORKS)

# include <sys/times.h>

#elif !defined(OPENSSL_SYS_WIN32)

# include <sys/time.h>

#endif



static void get_current_time(struct timeval *t);

static void get_current_time(struct timeval *t);

static int dtls1_handshake_write(SSL *s);

static int dtls1_handshake_write(SSL *s);

static size_t dtls1_link_min_mtu(void);

static size_t dtls1_link_min_mtu(void);