generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move header file inclusion logic and definition of timeval

Browse Source 
struct for platforms that don't have it to setup_once.h
This commit is contained in:
Yang Tse
2007-02-20 12:12:27 +00:00
parent 37f07a54bd
commit 29bb6f65f1
5 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ares/setup_once.h
View File

@@ -31,8 +31,49 @@
* Inclusion of common header files. * Inclusion of common header files.
*/ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <ctype.h>
#include <errno.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 * If we have the MSG_NOSIGNAL define, make sure we use

41
lib/setup_once.h
View File

@@ -38,8 +38,49 @@
* Inclusion of common header files. * Inclusion of common header files.
*/ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <ctype.h>
#include <errno.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 * If we have the MSG_NOSIGNAL define, make sure we use

21
lib/timeval.h
View File

@@ -30,27 +30,6 @@
#include "setup.h" #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); struct timeval curlx_tvnow(void);
/* /*

2
tests/libtest/testutil.c
View File

@@ -21,6 +21,8 @@
* $Id$ * $Id$
***************************************************************************/ ***************************************************************************/
#include "setup.h"
#include "testutil.h" #include "testutil.h"
#ifndef HAVE_GETTIMEOFDAY #ifndef HAVE_GETTIMEOFDAY

20
tests/libtest/testutil.h
View File

@@ -25,26 +25,6 @@
#include "setup.h" #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); struct timeval tutil_tvnow(void);