Config.cpp in passenger-5.3.6

- old
+ new

@@ -38,31 +38,33 @@
  * designated initializers. This should fix compilation problems on some systems.
  */
 #include <ap_config.h>
 #undef AP_HAVE_DESIGNATED_INITIALIZER
 
-#include "Config.h"
-#include "ConfigGeneral/SetterFuncs.h"
-#include "ConfigGeneral/ManifestGeneration.h"
-#include "DirConfig/AutoGeneratedCreateFunction.cpp"
-#include "DirConfig/AutoGeneratedMergeFunction.cpp"
-#include "Utils.h"
 #include <JsonTools/Autocast.h>
 #include <SystemTools/UserDatabase.h>
 #include <Utils.h>
 #include <Constants.h>
 
 // The APR headers must come after the Passenger headers.
 // See Hooks.cpp to learn why.
 #include <apr_strings.h>
 // In Apache < 2.4, this macro was necessary for core_dir_config and other structs
 #define CORE_PRIVATE
-#include <http_core.h>
+#include <httpd.h>
 #include <http_config.h>
 #include <http_log.h>
+#include <http_core.h>
 
+#include "Config.h"
+#include "ConfigGeneral/SetterFuncs.h"
+#include "ConfigGeneral/ManifestGeneration.h"
+#include "DirConfig/AutoGeneratedCreateFunction.cpp"
+#include "DirConfig/AutoGeneratedMergeFunction.cpp"
+#include "Utils.h"
 
+
 extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
 
 #ifdef APLOG_USE_MODULE
 	APLOG_USE_MODULE(passenger);
 #endif
@@ -70,10 +72,13 @@
 #ifndef ap_get_core_module_config
 	#define ap_get_core_module_config(s) ap_get_module_config(s, &core_module)
 #endif
 
 
+#include "ConfigGeneral/AutoGeneratedSetterFuncs.cpp"
+
+
 namespace Passenger {
 namespace Apache2Module {
 
 using namespace std;
 
@@ -172,12 +177,10 @@
 
 /*************************************************
  * Passenger settings
  *************************************************/
 
-#include "ConfigGeneral/AutoGeneratedSetterFuncs.cpp"
-
 static const char *
 cmd_passenger_enterprise_only(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return "this feature is only available in Phusion Passenger Enterprise. "
 		"You are currently running the open source Phusion Passenger Enterprise. "
 		"Please learn more about and/or buy Phusion Passenger Enterprise at https://www.phusionpassenger.com/enterprise";
@@ -244,13 +247,10 @@
 		config->mBaseURIs.insert(arg);
 		return NULL;
 	}
 }
 
-extern "C" const command_rec passenger_commands[] = {
-	#include "ConfigGeneral/AutoGeneratedDefinitions.cpp"
-	{ NULL }
-};
 
-
 } // namespace Apache2Module
 } // namespace Passenger
+
+#include "ConfigGeneral/AutoGeneratedDefinitions.cpp"