summaryrefslogtreecommitdiff
path: root/util/concat.c
diff options
context:
space:
mode:
authorRuss Allbery <rra@stanford.edu>2010-02-21 17:45:56 -0800
committerRuss Allbery <rra@stanford.edu>2010-02-21 17:45:56 -0800
commitae14bea1375dd5923d4a73e167b27bee13feb7b7 (patch)
treec1222395732cf8ce2cca32f013f080d19736f474 /util/concat.c
parent57aba51dc26ebf0bdd034f6cb418a9ea5f1fc0be (diff)
parent60210334fa3dbd5dd168199063c6ee850d750d0c (diff)
Merge commit 'upstream/0.10' into debian
Diffstat (limited to 'util/concat.c')
-rw-r--r--util/concat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/concat.c b/util/concat.c
index 1d08e08..bdbd836 100644
--- a/util/concat.c
+++ b/util/concat.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
* Concatenate strings with dynamic memory allocation.
*
* Usage:
@@ -26,7 +25,8 @@
#include <config.h>
#include <portable/system.h>
-#include <util/util.h>
+#include <util/concat.h>
+#include <util/xmalloc.h>
/* Abbreviation for cleaner code. */
#define VA_NEXT(var, type) ((var) = (type) va_arg(args, type))