summaryrefslogtreecommitdiffstats
path: root/runtime/modules.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-19 14:16:57 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-19 14:16:57 +0100
commitad0fa5175901ba101a1e06f4a39ae56b75f84dca (patch)
treeb25b46993ddc5339f5ff39da7a219f664f05deac /runtime/modules.h
parent6624ad434b5e346a84f600845c09739208382f43 (diff)
parent1049537cd853c9714c4bdc3fe4296dda8507900d (diff)
downloadrsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.gz
rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.xz
rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.zip
Merge branch 'v6-stable'
Conflicts: runtime/conf.c runtime/modules.c runtime/modules.h
Diffstat (limited to 'runtime/modules.h')
-rw-r--r--runtime/modules.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/runtime/modules.h b/runtime/modules.h
index 4956dd4a..6c5a2cba 100644
--- a/runtime/modules.h
+++ b/runtime/modules.h
@@ -138,8 +138,6 @@ struct modInfo_s {
rsRetVal (*doAction)(uchar**, unsigned, void*);
rsRetVal (*endTransaction)(void*);
rsRetVal (*parseSelectorAct)(uchar**, void**,omodStringRequest_t**);
- rsRetVal (*newScope)(void);
- rsRetVal (*restoreScope)(void);
rsRetVal (*newActInst)(uchar *modName, struct nvlst *lst, void **, omodStringRequest_t **);
} om;
struct { /* data for library modules */