Module Name: src
Committed By: joerg
Date: Fri Feb 19 23:01:28 UTC 2010
Modified Files:
src/external/bsd/mdocml/dist: mdoc_action.c
Log Message:
Merge
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/dist/mdoc_action.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/mdoc_action.c
diff -u src/external/bsd/mdocml/dist/mdoc_action.c:1.4 src/external/bsd/mdocml/dist/mdoc_action.c:1.5
--- src/external/bsd/mdocml/dist/mdoc_action.c:1.4 Thu Nov 5 20:38:42 2009
+++ src/external/bsd/mdocml/dist/mdoc_action.c Fri Feb 19 23:01:28 2010
@@ -1,4 +1,4 @@
-/* $Vendor-Id: mdoc_action.c,v 1.49 2009/11/02 06:22:45 kristaps Exp $ */
+/* $Vendor-Id: mdoc_action.c,v 1.50 2010/01/01 17:14:29 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <[email protected]>
*
@@ -14,6 +14,10 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifndef OSNAME
#include <sys/utsname.h>
#endif
@@ -42,10 +46,6 @@
const struct mdoc_node *, size_t);
static inline int order_rs(int);
-#ifdef __linux__
-extern size_t strlcat(char *, const char *, size_t);
-#endif
-
static int post_ar(POST_ARGS);
static int post_at(POST_ARGS);
static int post_bl(POST_ARGS);
