summaryrefslogtreecommitdiff
path: root/libproxy/proxy.cpp
diff options
context:
space:
mode:
authornpmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56>2010-01-28 05:47:08 +0000
committernpmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56>2010-01-28 05:47:08 +0000
commit0703d4b56b8be4dbfc18e2ba83c7537fe71d616f (patch)
treecec11ace1a5b620cf4abcc4546feec7428f40162 /libproxy/proxy.cpp
parent1413dcea3932fe0e1750fb69414a5c78769393be (diff)
downloadlibproxy-0703d4b56b8be4dbfc18e2ba83c7537fe71d616f.tar.gz
remove builtin module support; there is a better way to do this
git-svn-id: http://libproxy.googlecode.com/svn/trunk@509 c587cffe-e639-0410-9787-d7902ae8ed56
Diffstat (limited to 'libproxy/proxy.cpp')
-rw-r--r--libproxy/proxy.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/libproxy/proxy.cpp b/libproxy/proxy.cpp
index c2e1d35..cd0fbac 100644
--- a/libproxy/proxy.cpp
+++ b/libproxy/proxy.cpp
@@ -37,19 +37,6 @@ namespace googlecode {
namespace libproxy {
using namespace std;
-static const char* _builtin_modules[] = {
- BUILTIN_MODULES
- NULL
-};
-
-static struct {
- const char* condition;
- const char* modname;
-} _conditional_modules[] = {
- CONDITIONAL_MODULES
- {NULL, NULL}
-};
-
class proxy_factory {
public:
proxy_factory();
@@ -132,15 +119,6 @@ proxy_factory::proxy_factory() {
setenv("_PX_CONFIG_ORDER", tmp.c_str(), 1);
}
- // Load all builtin modules
- for (int i=0 ; _builtin_modules[i] ; i++)
- this->mm.load_builtin(_builtin_modules[i]);
-
- // Load conditional modules
- for (int i=0 ; _conditional_modules[i].modname ; i++)
- this->mm.load_file(string(MODULEDIR) + _conditional_modules[i].modname + "." + MODULEEXT,
- _conditional_modules[i].condition);
-
// Load all modules
this->mm.load_dir(MODULEDIR);