Commit 29bb6f65 authored by Yang Tse's avatar Yang Tse
Browse files

Move header file inclusion logic and definition of timeval 

struct for platforms that don't have it to setup_once.h
parent 37f07a54

ares/setup_once.h

+41 −0
Original line number Diff line number Diff line
@@ -31,8 +31,49 @@ 
 * Inclusion of common header files.

 */



#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdarg.h>

#include <ctype.h>

#include <errno.h>



#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif



#ifdef HAVE_SYS_STAT_H

#include <sys/stat.h>

#endif



#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#ifdef TIME_WITH_SYS_TIME

#include <time.h>

#endif

#else

#ifdef HAVE_TIME_H

#include <time.h>

#endif

#endif



#ifdef WIN32

#include <io.h>

#include <fcntl.h>

#endif





/*

 * Definition of timeval struct for platforms that don't have it.

 */



#ifndef HAVE_STRUCT_TIMEVAL

struct timeval {

 long tv_sec;

 long tv_usec;

};

#endif





/*

 * If we have the MSG_NOSIGNAL define, make sure we use

lib/setup_once.h

+41 −0
Original line number Diff line number Diff line
@@ -38,8 +38,49 @@ 
 * Inclusion of common header files.

 */



#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdarg.h>

#include <ctype.h>

#include <errno.h>



#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif



#ifdef HAVE_SYS_STAT_H

#include <sys/stat.h>

#endif



#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#ifdef TIME_WITH_SYS_TIME

#include <time.h>

#endif

#else

#ifdef HAVE_TIME_H

#include <time.h>

#endif

#endif



#ifdef WIN32

#include <io.h>

#include <fcntl.h>

#endif





/*

 * Definition of timeval struct for platforms that don't have it.

 */



#ifndef HAVE_STRUCT_TIMEVAL

struct timeval {

 long tv_sec;

 long tv_usec;

};

#endif





/*

 * If we have the MSG_NOSIGNAL define, make sure we use

lib/timeval.h

+0 −21
Original line number Diff line number Diff line
@@ -30,27 +30,6 @@ 


#include "setup.h"



#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif

#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#ifdef TIME_WITH_SYS_TIME

#include <time.h>

#endif

#else

#ifdef HAVE_TIME_H

#include <time.h>

#endif

#endif



#ifndef HAVE_STRUCT_TIMEVAL

struct timeval {

 long tv_sec;

 long tv_usec;

};

#endif



struct timeval curlx_tvnow(void);



/*

tests/libtest/testutil.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 * $Id$

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



#include "setup.h"



#include "testutil.h"



#ifndef HAVE_GETTIMEOFDAY

tests/libtest/testutil.h

+0 −20
Original line number Diff line number Diff line
@@ -25,26 +25,6 @@ 


#include "setup.h"



#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif

#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#ifdef TIME_WITH_SYS_TIME

#include <time.h>

#endif

#else

#ifdef HAVE_TIME_H

#include <time.h>

#endif

#endif



#ifndef HAVE_STRUCT_TIMEVAL

struct timeval {

 long tv_sec;

 long tv_usec;

};

#endif



struct timeval tutil_tvnow(void);