summaryrefslogtreecommitdiff
path: root/modules/arch
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2012-10-04 11:44:34 +0000
committerJoe Orton <jorton@apache.org>2012-10-04 11:44:34 +0000
commitca9bd8eb67f16edf3ea2a4f40c61ac5a373bb557 (patch)
tree4c96aa73aca08341d59f3a92b59e8499182c2b09 /modules/arch
parent7414006ae9c85731e98d54bff80a043910d6bf96 (diff)
downloadhttpd-ca9bd8eb67f16edf3ea2a4f40c61ac5a373bb557.tar.gz
* modules/arch/unix/mod_systemd.c (systemd_pre_mpm): Simplify code
slightly; no functional change. Use AP_DECLARE_MODULE. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1393997 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/arch')
-rw-r--r--modules/arch/unix/mod_systemd.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/arch/unix/mod_systemd.c b/modules/arch/unix/mod_systemd.c
index 0db076e21a..fa56151949 100644
--- a/modules/arch/unix/mod_systemd.c
+++ b/modules/arch/unix/mod_systemd.c
@@ -37,15 +37,12 @@
static int systemd_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type)
{
int rv;
- pid_t pid;
- pid = getpid();
ap_extended_status = 1;
rv = sd_notifyf(0, "READY=1\n"
"STATUS=Processing requests...\n"
- "MAINPID=%lu",
- (unsigned long) pid);
+ "MAINPID=%" APR_PID_T_FMT, getpid());
if (rv < 0) {
ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, APLOGNO(02395)
"sd_notifyf returned an error %d", rv);
@@ -91,8 +88,7 @@ static void systemd_register_hooks(apr_pool_t *p)
ap_hook_monitor(systemd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA systemd_module =
-{
+AP_DECLARE_MODULE(systemd) = {
STANDARD20_MODULE_STUFF,
NULL,
NULL,