From: Jim Jagielski <jim@apache.org>
Date: Fri, 22 May 2009 16:44:15 +0000 (+0000)
Subject: avoid a relatively ugly code dup
X-Git-Tag: 2.3.3~549
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b452fee01875d313b2154e94258facc51d02ced;p=apache

avoid a relatively ugly code dup


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@777614 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 40278eb314..dee8bc6c1c 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -84,13 +84,11 @@ static apr_status_t unixd_set_shm_perms(const char *fname)
     if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) {
         return errno;
     }
-#if MODULE_MAGIC_NUMBER_MAJOR > 20081212
+#if MODULE_MAGIC_NUMBER_MAJOR <= 20081212
+#define ap_unixd_config unixd_config
+#endif
     shmbuf.shm_perm.uid  = ap_unixd_config.user_id;
     shmbuf.shm_perm.gid  = ap_unixd_config.group_id;
-#else
-    shmbuf.shm_perm.uid  = unixd_config.user_id;
-    shmbuf.shm_perm.gid  = unixd_config.group_id;
-#endif
     shmbuf.shm_perm.mode = 0600;
     if (shmctl(shmid, IPC_SET, &shmbuf) == -1) {
         return errno;