summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-19 09:24:03 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-19 09:24:03 +0200
commitcb0fa751b7e18ffe71aec84bccfeaf04fca7ff13 (patch)
treeb985c583bca6486cdf628a56a24c13c37288f2c8 /runtime
parentfe5bea77ac2533faab3b7b73bc253c4dc7d702bc (diff)
parent55714cdb440b4baa32f88d55316755555ef93607 (diff)
downloadrsyslog-cb0fa751b7e18ffe71aec84bccfeaf04fca7ff13.tar.gz
rsyslog-cb0fa751b7e18ffe71aec84bccfeaf04fca7ff13.tar.xz
rsyslog-cb0fa751b7e18ffe71aec84bccfeaf04fca7ff13.zip
Merge branch 'master' into tmp
Conflicts: tests/Makefile.am
Diffstat (limited to 'runtime')
-rw-r--r--runtime/vm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/vm.c b/runtime/vm.c
index 41d3e483..125b0d21 100644
--- a/runtime/vm.c
+++ b/runtime/vm.c
@@ -25,6 +25,7 @@
#include "config.h"
#include <stdlib.h>
+#include <string.h>
#include <assert.h>
#include <ctype.h>