Remove obsolete #ifdef check

diff --git a/src/Network/HTTPClient.cxx b/src/Network/HTTPClient.cxx
index d765c0a429ca285df9a59be0a10e4f6fdcde9ebb..8cac7361cc51f82fbcce69cfdd466e09a151ee67 100644 (file)
--- a/src/Network/HTTPClient.cxx
+++ b/src/Network/HTTPClient.cxx
@@ -47,8 +47,6 @@ typedef nasal::Ghost<pkg::PackageRef> NasalPackage;
 typedef nasal::Ghost<pkg::CatalogRef> NasalCatalog;
 typedef nasal::Ghost<pkg::InstallRef> NasalInstall;
 
-#define ENABLE_PACKAGE_SYSTEM 1
-
 namespace {
   
   class FGDelegate : public pkg::Delegate
@@ -132,7 +130,6 @@ void FGHTTPClient::init()
     _http->setProxy(proxyHost, proxyPort, proxyAuth);
   }
   
-#ifdef ENABLE_PACKAGE_SYSTEM
   pkg::Root* packageRoot = globals->packageRoot();
   if (packageRoot) {
     // package system needs access to the HTTP engine too
@@ -155,7 +152,6 @@ void FGHTTPClient::init()
     // start a refresh now
     packageRoot->refresh();
   }
-#endif // of ENABLE_PACKAGE_SYSTEM
 }
 
 static naRef f_package_existingInstall( pkg::Package& pkg,
@@ -231,7 +227,6 @@ static naRef f_package_variants(pkg::Package& pack, naContext c)
 
 void FGHTTPClient::postinit()
 {
-#ifdef ENABLE_PACKAGE_SYSTEM
   NasalPackageRoot::init("PackageRoot")
   .member("path", &pkg::Root::path)
   .member("version", &pkg::Root::catalogVersion)
@@ -291,7 +286,6 @@ void FGHTTPClient::postinit()
     nasal::Hash nasalPkg = nasalGlobals.createHash("pkg"); // module
     nasalPkg.set("root", packageRoot);
   }
-#endif // of ENABLE_PACKAGE_SYSTEM
 }
 
 void FGHTTPClient::shutdown()

diff --git a/src/Network/http/httpd.cxx b/src/Network/http/httpd.cxx
index 3f38be83248f4f78281d2c1bcf2979465f01daf7..724596976dc9f70663718728d5a17ddd4fade4b9 100644 (file)
--- a/src/Network/http/httpd.cxx
+++ b/src/Network/http/httpd.cxx
@@ -453,12 +453,10 @@ void MongooseHttpd::init()
       _uriHandler.push_back(new flightgear::http::JsonUriHandler(uri));
     }
 
-//#ifdef ENABLE_PACKAGE_SYSTEM
     if ((uri = n->getStringValue("pkg"))[0] != 0) {
       SG_LOG(SG_NETWORK, SG_INFO, "httpd: adding pkg uri handler at " << uri);
       _uriHandler.push_back(new flightgear::http::PkgUriHandler(uri));
     }
-//#endif
 
     if ((uri = n->getStringValue("flighthistory"))[0] != 0) {
       SG_LOG(SG_NETWORK, SG_INFO, "httpd: adding flighthistory uri handler at " << uri);