summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-18 12:20:02 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-18 12:20:02 +0200
commit22ad77a627fe813acd286b48aaf44945c0480f49 (patch)
treecf737609203a055db3b70eb4cd1a711955ac7233
parent1daf8d492f932739b6fcde732812116c7666b2bc (diff)
downloadrsyslog-22ad77a627fe813acd286b48aaf44945c0480f49.tar.gz
rsyslog-22ad77a627fe813acd286b48aaf44945c0480f49.tar.xz
rsyslog-22ad77a627fe813acd286b48aaf44945c0480f49.zip
fixed abort on rsyslogd termination
-rw-r--r--runtime/nsd_ptcp.c2
-rw-r--r--runtime/obj-types.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c
index 98de5802..6f7dd04d 100644
--- a/runtime/nsd_ptcp.c
+++ b/runtime/nsd_ptcp.c
@@ -67,7 +67,7 @@ ENDobjConstruct(nsd_ptcp)
/* destructor for the nsd_ptcp object */
BEGINobjDestruct(nsd_ptcp) /* be sure to specify the object type also in END and CODESTART macros! */
int i;
-CODESTARTobjDestruct(nsd_pctp)
+CODESTARTobjDestruct(nsd_ptcp)
if(pThis->sock != -1) {
close(pThis->sock);
pThis->sock = -1;
diff --git a/runtime/obj-types.h b/runtime/obj-types.h
index e3df7239..acdc757d 100644
--- a/runtime/obj-types.h
+++ b/runtime/obj-types.h
@@ -377,9 +377,6 @@ rsRetVal objName##ClassExit(void) \
*/
#define CORE_COMPONENT NULL /* use this to indicate this is a core component */
#define DONT_LOAD_LIB NULL /* do not load a library to obtain object interface (currently same as CORE_COMPONENT) */
-/*#define objUse(objName, MYLIB, FILENAME) \
- obj.UseObj(__FILE__, (uchar*)#objName, MYLIB, (uchar*)FILENAME, (void*) &objName)
-*/
#define objUse(objName, FILENAME) \
obj.UseObj(__FILE__, (uchar*)#objName, (uchar*)FILENAME, (void*) &objName)
#define objRelease(objName, FILENAME) \