diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-14 15:45:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-14 15:45:13 +0200 |
| commit | e84edbdba5eff2460e9349ab131090a785aa190b (patch) | |
| tree | 31462250c44eaa996ae1dcdfb2f6e9d2569f826d /runtime/msg.c | |
| parent | 6fdd4aee769f3a1b6eb5687f5857bf148f06ed7a (diff) | |
| parent | 78469b4c6a82887c70e2cac365af7a66051f8ba7 (diff) | |
| download | rsyslog-e84edbdba5eff2460e9349ab131090a785aa190b.tar.gz rsyslog-e84edbdba5eff2460e9349ab131090a785aa190b.tar.bz2 rsyslog-e84edbdba5eff2460e9349ab131090a785aa190b.zip | |
Merge branch 'v4-devel' into master
Conflicts:
configure.ac
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" |