Commit fb456902 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove redundant includes from dtls1.h 



There were a set of includes in dtls1.h which are now redundant due to the
libssl opaque work. This commit removes those includes, which also has the
effect of resolving one issue preventing building on windows (i.e. the
include of winsock.h)

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 995101d6

include/openssl/dtls1.h

+0 −19
Original line number Diff line number Diff line
@@ -60,25 +60,6 @@ 
#ifndef HEADER_DTLS1_H

# define HEADER_DTLS1_H



# include <openssl/buffer.h>

# include <openssl/pqueue.h>

# ifdef OPENSSL_SYS_VMS

#  include <resource.h>

#  include <sys/timeb.h>

# endif

# ifdef OPENSSL_SYS_WIN32

/* Needed for struct timeval */

#  include <winsock.h>

# elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)

#  include <sys/timeval.h>

# else

#  if defined(OPENSSL_SYS_VXWORKS)

#   include <sys/times.h>

#  else

#   include <sys/time.h>

#  endif

# endif



#ifdef  __cplusplus

extern "C" {

#endif

ssl/d1_lib.c

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ 


#if defined(OPENSSL_SYS_VMS)

# include <sys/timeb.h>

#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)

# include <sys/timeval.h>

#elif 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);

ssl/record/record.h

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 
 *

 */



#include <openssl/pqueue.h>



/*****************************************************************************

 *                                                                           *

 * These structures should be considered PRIVATE to the record layer. No     *