diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 5 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ntp.c | 2 | ||||
| -rw-r--r-- | print-ntp.c | 2 | ||||
| -rw-r--r-- | print-zep.c | 2 |
8 files changed, 3 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bca3e9b1..635c430a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -416,7 +416,6 @@ if(NOT HAVE_SNPRINTF) endif() check_function_exists(getopt_long HAVE_GETOPT_LONG) -check_function_exists(strftime HAVE_STRFTIME) check_function_exists(setlinebuf HAVE_SETLINEBUF) # # For Windows, don't need to waste time checking for fork() or vfork(). diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 9bd23d7a..d008c794 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -102,7 +102,7 @@ /* Define to 1 if you have the `pcap_dump_flush' function. */ #cmakedefine HAVE_PCAP_DUMP_FLUSH 1 -/* define if libpcap has pcap_dump_ftell() */ +/* Define to 1 if you have the `pcap_dump_ftell' function. */ #cmakedefine HAVE_PCAP_DUMP_FTELL 1 /* Define to 1 if you have the `pcap_dump_ftell64' function. */ @@ -177,9 +177,6 @@ /* Define to 1 if you have the `strdup' function. */ #cmakedefine HAVE_STRDUP 1 -/* Define to 1 if you have the `strftime' function. */ -#cmakedefine HAVE_STRFTIME 1 - /* Define to 1 if you have the <strings.h> header file. */ #cmakedefine HAVE_STRINGS_H 1 diff --git a/config.h.in b/config.h.in index afe0dc2e..ada6aad9 100644 --- a/config.h.in +++ b/config.h.in @@ -180,9 +180,6 @@ /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H @@ -5178,7 +5178,7 @@ esac fi -for ac_func in fork vfork strftime +for ac_func in fork vfork 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" diff --git a/configure.ac b/configure.ac index fccebbcd..0278e7c5 100644 --- a/configure.ac +++ b/configure.ac @@ -407,7 +407,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then fi AC_REPLACE_FUNCS(strlcat strlcpy strdup strsep getservent getopt_long) -AC_CHECK_FUNCS(fork vfork strftime) +AC_CHECK_FUNCS(fork vfork) AC_CHECK_FUNCS(setlinebuf) # @@ -48,7 +48,6 @@ p_ntp_time(netdissect_options *ndo, f = (uint32_t)(ff * 1000000000.0); /* treat fraction as parts per billion */ ND_PRINT("%u.%09u", i, f); -#ifdef HAVE_STRFTIME /* * print the UTC time in human-readable format. */ @@ -81,5 +80,4 @@ p_ntp_time(netdissect_options *ndo, } } } -#endif } diff --git a/print-ntp.c b/print-ntp.c index 86e29e69..499585fd 100644 --- a/print-ntp.c +++ b/print-ntp.c @@ -38,9 +38,7 @@ #include "netdissect-stdinc.h" -#ifdef HAVE_STRFTIME #include <time.h> -#endif #define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" diff --git a/print-zep.c b/print-zep.c index 7186f74a..da1e91c7 100644 --- a/print-zep.c +++ b/print-zep.c @@ -77,7 +77,6 @@ static void zep_print_ts(netdissect_options *ndo, const u_char *p) billion */ ND_PRINT("%u.%09d", i, f); -#ifdef HAVE_STRFTIME /* * print the time in human-readable format. */ @@ -90,7 +89,6 @@ static void zep_print_ts(netdissect_options *ndo, const u_char *p) strftime(time_buf, sizeof (time_buf), "%Y/%m/%d %H:%M:%S", tm); ND_PRINT(" (%s)", time_buf); } -#endif } /* |