diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | config.h.in | 6 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | portability.h | 8 |
5 files changed, 4 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eefe1b16..67fefb31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -860,9 +860,6 @@ if(HAVE_ETHER_HOSTTON) endif() cmake_pop_check_state() -check_function_exists(timeradd HAVE_TIMERADD) -check_function_exists(timersub HAVE_TIMERSUB) - # # Large file support on UN*X, a/k/a LFS. # diff --git a/config.h.in b/config.h.in index 779966a8..00618aec 100644 --- a/config.h.in +++ b/config.h.in @@ -250,12 +250,6 @@ /* define if you have the TurboCap API */ #undef HAVE_TC_API -/* Define to 1 if you have the `timeradd' function. */ -#undef HAVE_TIMERADD - -/* Define to 1 if you have the `timersub' function. */ -#undef HAVE_TIMERSUB - /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H @@ -6213,19 +6213,6 @@ fi fi fi -for ac_func in timeradd timersub -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - # # For various things that might use pthreads. # diff --git a/configure.ac b/configure.ac index 78be52da..cc112e08 100644 --- a/configure.ac +++ b/configure.ac @@ -511,8 +511,6 @@ if test "$ac_cv_func_ether_hostton" = yes; then fi fi -AC_CHECK_FUNCS(timeradd timersub) - # # For various things that might use pthreads. # diff --git a/portability.h b/portability.h index 3acc9ba2..84d0778a 100644 --- a/portability.h +++ b/portability.h @@ -113,7 +113,7 @@ extern int pcap_vasprintf(char **, const char *, va_list ap); #endif /* For Solaris before 11. */ -#ifndef HAVE_TIMERADD +#ifndef timeradd #define timeradd(a, b, result) \ do { \ (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ @@ -123,8 +123,8 @@ extern int pcap_vasprintf(char **, const char *, va_list ap); (result)->tv_usec -= 1000000; \ } \ } while (0) -#endif /* HAVE_TIMERADD */ -#ifndef HAVE_TIMERSUB +#endif /* timeradd */ +#ifndef timersub #define timersub(a, b, result) \ do { \ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ @@ -134,7 +134,7 @@ extern int pcap_vasprintf(char **, const char *, va_list ap); (result)->tv_usec += 1000000; \ } \ } while (0) -#endif /* HAVE_TIMERSUB */ +#endif /* timersub */ #ifdef HAVE_STRTOK_R #define pcap_strtok_r strtok_r |