diff options
| author | Michael Biebl <biebl@debian.org> | 2010-02-24 20:31:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-02-24 20:31:30 +0100 |
| commit | 98a45d0b54c09ca82b3540491915ad6cc61c1a97 (patch) | |
| tree | 0ec782ee7d1097acfdf2962b3b9b3404db314002 /runtime/obj.h | |
| parent | b743785de633f7ff5c39f980496d359e4758ec83 (diff) | |
| download | rsyslog-98a45d0b54c09ca82b3540491915ad6cc61c1a97.tar.gz | |
Imported Upstream version 4.6.0upstream/4.6.0
Diffstat (limited to 'runtime/obj.h')
| -rw-r--r-- | runtime/obj.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/obj.h b/runtime/obj.h index dc04203..419d29c 100644 --- a/runtime/obj.h +++ b/runtime/obj.h @@ -68,7 +68,7 @@ #define objSerializePTR(strm, propName, propType) \ CHKiRet(obj.SerializeProp(strm, (uchar*) #propName, PROPTYPE_##propType, (void*) pThis->propName)); #define DEFobjStaticHelpers \ - static objInfo_t *pObjInfoOBJ = NULL; \ + static objInfo_t __attribute__((unused)) *pObjInfoOBJ = NULL; \ DEFobjCurrIf(obj) @@ -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]) |