Merge remote-tracking branch 'origin/master' into rewrite-filter

[metaproxy-moved-to-github.git] / src / factory_static.cpp

diff --git a/src/factory_static.cpp b/src/factory_static.cpp
index 26078b3..95d0a62 100644 (file)
--- a/src/factory_static.cpp
+++ b/src/factory_static.cpp
@@ -60,8 +60,6 @@ namespace mp = metaproxy_1;
 
 mp::FactoryStatic::FactoryStatic()
 {
-#ifdef HAVE_DLFCN_H
-#else
     struct metaproxy_1_filter_struct *buildins[] = {
         &metaproxy_1_filter_auth_simple,
         &metaproxy_1_filter_backend_test,
@@ -69,7 +67,7 @@ mp::FactoryStatic::FactoryStatic()
 #ifndef WIN32
         &metaproxy_1_filter_cgi,
 #endif
-        &metaproxy_1_filter_cql_to_rpn,
+        &metaproxy_1_filter_cql_rpn,
         &metaproxy_1_filter_frontend_net,
         &metaproxy_1_filter_http_client,
         &metaproxy_1_filter_http_file,
@@ -84,7 +82,7 @@ mp::FactoryStatic::FactoryStatic()
         &metaproxy_1_filter_sd_remove,
         &metaproxy_1_filter_session_shared,
         &metaproxy_1_filter_sort,
-        &metaproxy_1_filter_sru_to_z3950,
+        &metaproxy_1_filter_sru_z3950,
         &metaproxy_1_filter_template,
         &metaproxy_1_filter_virt_db,
         &metaproxy_1_filter_z3950_client,
@@ -97,8 +95,6 @@ mp::FactoryStatic::FactoryStatic()
 
     for (i = 0; buildins[i]; i++)
         add_creator(buildins[i]->type, buildins[i]->creator);
-// WIN32
-#endif
 }