diff options
| author |   sthen <sthen@openbsd.org> | 2012-03-02 08:40:57 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2012-03-02 08:40:57 +0000 |
| commit | 61eb10894d7969d88a43144281bb368a916af22f (patch) | |
| tree | d26f0a903cb7396762554c8b17df30ecfcba6349 /usr.sbin/nsd/configure.ac | |
| parent | import nsd 3.2.10, "cool" jakob@, also looked over by Brad (diff) | |
| download | wireguard-openbsd-61eb10894d7969d88a43144281bb368a916af22f.tar.xz wireguard-openbsd-61eb10894d7969d88a43144281bb368a916af22f.zip | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/configure.ac')
| -rw-r--r-- | usr.sbin/nsd/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/nsd/configure.ac b/usr.sbin/nsd/configure.ac index 79087e654bc..d0bc1711f13 100644 --- a/usr.sbin/nsd/configure.ac +++ b/usr.sbin/nsd/configure.ac @@ -4,7 +4,7 @@ dnl sinclude(acx_nlnetlabs.m4) -AC_INIT(NSD,3.2.9,nsd-bugs@nlnetlabs.nl) +AC_INIT(NSD,3.2.10,nsd-bugs@nlnetlabs.nl) AC_CONFIG_HEADER([config.h]) AC_AIX @@ -350,7 +350,7 @@ AC_CACHE_VAL(ac_cv_c_strptime_needs_defs, [ cat >conftest.c <<EOF #include <time.h> -void testing (void) { struct tm t; char *timestr; strptime(timestr, "%Y%m", &t); } +int testing (void) { struct tm t; const char *timestr="201201"; return strptime(timestr, "%Y%m", &t)!=0; } EOF if test -z "`$CC -Wall -Werror -c conftest.c 2>&1`"; then eval "ac_cv_c_strptime_needs_defs=no" |