summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-24 15:17:04 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-24 15:17:04 +0200
commitdb3d5edbe6ac016d99122deeb3da640d7d8864a2 (patch)
tree7d4239b482900e0f7ebd49ae7f2fef2eea482767 /runtime
parent539f33c6a064b8c28cbb318e856dc50c213fd844 (diff)
parent301ac7591ada58671cf6a02646a7481bf1bfa469 (diff)
downloadrsyslog-db3d5edbe6ac016d99122deeb3da640d7d8864a2.tar.gz
rsyslog-db3d5edbe6ac016d99122deeb3da640d7d8864a2.tar.xz
rsyslog-db3d5edbe6ac016d99122deeb3da640d7d8864a2.zip
Merge branch 'beta'
Diffstat (limited to 'runtime')
-rw-r--r--runtime/msg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index 1a882597..8aab5317 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -616,7 +616,9 @@ CODESTARTobjDestruct(msg)
}
# endif
} else {
+# ifndef HAVE_ATOMIC_BUILTINS
MsgUnlock(pThis);
+# endif
pThis = NULL; /* tell framework not to destructing the object! */
}
ENDobjDestruct(msg)