diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-18 12:20:20 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-18 12:20:20 +0200 |
commit | 20480349def97f33d25c085fbaaef063603b87d1 (patch) | |
tree | 2f43736111199eaacb1391b764e43f48ce0dfb27 | |
parent | 961f2956e86c1dc4442ccbeb3951855e85a0b08d (diff) | |
parent | 22ad77a627fe813acd286b48aaf44945c0480f49 (diff) | |
download | rsyslog-20480349def97f33d25c085fbaaef063603b87d1.tar.gz rsyslog-20480349def97f33d25c085fbaaef063603b87d1.tar.xz rsyslog-20480349def97f33d25c085fbaaef063603b87d1.zip |
Merge branch 'sock-abstract' into tls
-rw-r--r-- | runtime/nsd_ptcp.c | 2 | ||||
-rw-r--r-- | runtime/obj-types.h | 3 |
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) \ |