summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-06-15 20:26:47 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-06-15 20:26:47 +0000
commitb06a75d0798f3ff62d04b3ade52cf34a4ff94613 (patch)
tree119aaa0ce57668fe060d350f55447ab450301553
parent1c88e3ea6b9ec4290049e18d006dcb8add62d66f (diff)
downloadmandoc-b06a75d0798f3ff62d04b3ade52cf34a4ff94613.tar.gz
mandoc-b06a75d0798f3ff62d04b3ade52cf34a4ff94613.tar.zst
mandoc-b06a75d0798f3ff62d04b3ade52cf34a4ff94613.zip
Removed superfluous ifdef around strftime (schwarze@openbsd.org).
Bumped version (this was supposed to be in 1.7.17).
-rw-r--r--Makefile2
-rw-r--r--man_term.c6
-rw-r--r--mdoc_term.c6
3 files changed, 3 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 09c7e467..6e88275b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ INSTALL_DATA = install -m 0444
INSTALL_LIB = install -m 0644
INSTALL_MAN = $(INSTALL_DATA)
-VERSION = 1.7.17
+VERSION = 1.7.18
VDATE = 15 June 2009
VFLAGS = -DVERSION=\"$(VERSION)\"
diff --git a/man_term.c b/man_term.c
index 740ddaf7..b07602d3 100644
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/* $Id: man_term.c,v 1.12 2009/06/11 13:18:42 kristaps Exp $ */
+/* $Id: man_term.c,v 1.13 2009/06/15 20:26:47 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -449,11 +449,7 @@ print_foot(struct termp *p, const struct man_meta *meta)
tm = localtime(&meta->date);
-#ifdef __OpenBSD__
- if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#endif
err(1, "strftime");
term_vspace(p);
diff --git a/mdoc_term.c b/mdoc_term.c
index ec440962..7cf400f9 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_term.c,v 1.12 2009/06/12 09:18:00 kristaps Exp $ */
+/* $Id: mdoc_term.c,v 1.13 2009/06/15 20:26:47 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -415,11 +415,7 @@ print_foot(struct termp *p, const struct mdoc_meta *meta)
tm = localtime(&meta->date);
-#ifdef __OpenBSD__
- if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#endif
err(1, "strftime");
(void)strlcpy(os, meta->os, p->rmargin);