fly/flightgear
1
0
Fork 0
Code Activity

Remove obsolete #ifdef check

Browse source
This commit is contained in:
James Turner 2015-03-10 07:54:12 +00:00
parent 92864265af
commit 68efa84b3a
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Network/HTTPClient.cxx
View file

@ -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()

2
src/Network/http/httpd.cxx
View file

@ -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);