diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-14 15:40:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-14 15:40:06 +0200 |
| commit | b81c4252e808de51c022bbfda96a91ddc697e86c (patch) | |
| tree | 3a07b9dc782eaf0f57843a30bdf7037d9ca32cf8 /runtime/msg.c | |
| parent | 8d6067735120876742fc0cc97c9d14c5578a3b0b (diff) | |
| parent | 92b4f6d610a3b4de9066d4f26a712cf6b1507250 (diff) | |
| download | rsyslog-b81c4252e808de51c022bbfda96a91ddc697e86c.tar.gz rsyslog-b81c4252e808de51c022bbfda96a91ddc697e86c.tar.xz rsyslog-b81c4252e808de51c022bbfda96a91ddc697e86c.zip | |
Merge branch 'v4-beta' into beta
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 8beb9c32..5a33837f 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -35,7 +35,9 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include <malloc.h> +#if HAVE_MALLOC_H +# include <malloc.h> +#endif #include "rsyslog.h" #include "srUtils.h" #include "stringbuf.h" |