diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-23 17:23:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-23 17:23:28 +0200 |
| commit | a3e512f65f411bd0a4853d3dca9a3f3e6593e490 (patch) | |
| tree | e68d6057b43388dccfd0c5c930619e977d26e856 /runtime/obj.h | |
| parent | 06e59df5ded6fa51becb3abe14430027c72f1088 (diff) | |
| parent | b2fa740b9ab5fb9e85309b3307f3fca21f625ab1 (diff) | |
| download | rsyslog-a3e512f65f411bd0a4853d3dca9a3f3e6593e490.tar.gz rsyslog-a3e512f65f411bd0a4853d3dca9a3f3e6593e490.tar.bz2 rsyslog-a3e512f65f411bd0a4853d3dca9a3f3e6593e490.zip | |
Merge branch 'omfile' into v5-devel
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/obj.h')
| -rw-r--r-- | runtime/obj.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/obj.h b/runtime/obj.h index 3973a16e..419d29cc 100644 --- a/runtime/obj.h +++ b/runtime/obj.h @@ -77,11 +77,13 @@ /* the next macro MUST be called in Constructors: */ #ifndef NDEBUG /* this means if debug... */ # define objConstructSetObjInfo(pThis) \ - ASSERT(((obj_t*) (pThis))->pObjInfo == NULL); \ ((obj_t*) (pThis))->pObjInfo = pObjInfoOBJ; \ + ((obj_t*) (pThis))->pszName = NULL; \ ((obj_t*) (pThis))->iObjCooCKiE = 0xBADEFEE #else -# define objConstructSetObjInfo(pThis) ((obj_t*) (pThis))->pObjInfo = pObjInfoOBJ +# define objConstructSetObjInfo(pThis) \ + ((obj_t*) (pThis))->pObjInfo = pObjInfoOBJ; \ + ((obj_t*) (pThis))->pszName = NULL #endif #define objDestruct(pThis) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_DESTRUCT])(&pThis) #define objSerialize(pThis) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_SERIALIZE]) |