summaryrefslogtreecommitdiffstats
path: root/runtime/obj-types.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-18 11:49:51 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-18 11:49:51 +0200
commit961f2956e86c1dc4442ccbeb3951855e85a0b08d (patch)
treedd1db48602d1c145d1fd28a9d8482285a6564b87 /runtime/obj-types.h
parenta6a9148586df7bba12cbc0bc236605f83640932f (diff)
parent1daf8d492f932739b6fcde732812116c7666b2bc (diff)
downloadrsyslog-961f2956e86c1dc4442ccbeb3951855e85a0b08d.tar.gz
rsyslog-961f2956e86c1dc4442ccbeb3951855e85a0b08d.tar.bz2
rsyslog-961f2956e86c1dc4442ccbeb3951855e85a0b08d.zip
Merge branch 'sock-abstract' into tls
Diffstat (limited to 'runtime/obj-types.h')
-rw-r--r--runtime/obj-types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/obj-types.h b/runtime/obj-types.h
index e245b633..e3df7239 100644
--- a/runtime/obj-types.h
+++ b/runtime/obj-types.h
@@ -81,13 +81,13 @@ struct objInfo_s {
};
-typedef struct obj { /* the dummy struct that each derived class can be casted to */
+struct obj_s { /* the dummy struct that each derived class can be casted to */
objInfo_t *pObjInfo;
#ifndef NDEBUG /* this means if debug... */
unsigned int iObjCooCKiE; /* must always be 0xBADEFEE for a valid object */
#endif
uchar *pszName; /* the name of *this* specific object instance */
-} obj_t;
+};
/* macros which must be gloablly-visible (because they are used during definition of