mod_h2

[apache] / include / http_main.h

diff --git a/include/http_main.h b/include/http_main.h
index 1079507c80f08ca61f61a0e206b679d69afd7ed6..fa1ce85216d54bfa0ca4a8df7790dd6e29966484 100644 (file)
--- a/include/http_main.h
+++ b/include/http_main.h
@@ -43,14 +43,21 @@ extern "C" {
 AP_DECLARE_DATA extern const char *ap_server_argv0;
 /** The global server's ServerRoot */
 AP_DECLARE_DATA extern const char *ap_server_root;
+/** The global server's DefaultRuntimeDir
+ * This is not usable directly in the general case; use
+ * ap_runtime_dir_relative() instead.
+ */
+AP_DECLARE_DATA extern const char *ap_runtime_dir;
 /** The global server's server_rec */
 AP_DECLARE_DATA extern server_rec *ap_server_conf;
 /** global pool, for access prior to creation of server_rec */
 AP_DECLARE_DATA extern apr_pool_t *ap_pglobal;
 /** state of the server (startup, exiting, ...) */
-AP_DECLARE_DATA int ap_main_state;
+AP_DECLARE_DATA extern int ap_main_state;
+/** run mode (normal, config test, config dump, ...) */
+AP_DECLARE_DATA extern int ap_run_mode;
 /** run mode (normal, config test, config dump, ...) */
-AP_DECLARE_DATA int ap_run_mode;
+AP_DECLARE_DATA extern int ap_config_generation;
 
 /* for -C, -c and -D switches */
 /** An array of all -C directives.  These are processed before the server's
@@ -77,5 +84,5 @@ APR_DECLARE_OPTIONAL_FN(int, ap_signal_server, (int *status, apr_pool_t *pool));
 }
 #endif
 
-#endif /* !APACHE_HTTP_MAIN_H */
+#endif  /* !APACHE_HTTP_MAIN_H */
 /** @} */