httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject svn commit: r739487 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c modules/arch/unix/mod_unixd.h os/unix/unixd.h
Date Sat, 31 Jan 2009 01:46:56 GMT
Author: fielding
Date: Sat Jan 31 01:46:56 2009
New Revision: 739487

URL: http://svn.apache.org/viewvc?rev=739487&view=rev
Log:
use a local module header file to store the function prototype
for ap_unixd_setup_child() that is used outside this module.


Added:
    httpd/httpd/trunk/modules/arch/unix/mod_unixd.h   (with props)
Modified:
    httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
    httpd/httpd/trunk/os/unix/unixd.h

Modified: httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.c?rev=739487&r1=739486&r2=739487&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.c Sat Jan 31 01:46:56 2009
@@ -22,7 +22,7 @@
 #include "mpm_common.h"
 #include "os.h"
 #include "ap_mpm.h"
-#include "unixd.h"
+#include "mod_unixd.h"
 #include "apr_thread_proc.h"
 #include "apr_strings.h"
 #include "apr_portable.h"

Added: httpd/httpd/trunk/modules/arch/unix/mod_unixd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.h?rev=739487&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.h (added)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.h Sat Jan 31 01:46:56 2009
@@ -0,0 +1,41 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file  mod_unixd.h
+ * @brief common stuff that unix MPMs will want 
+ *
+ * @addtogroup APACHE_OS_UNIX
+ * @{
+ */
+
+#ifndef MOD_UNIXD_H
+#define MOD_UNIXD_H
+
+#include "ap_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+AP_DECLARE(int) ap_unixd_setup_child(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/** @} */

Propchange: httpd/httpd/trunk/modules/arch/unix/mod_unixd.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/trunk/os/unix/unixd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.h?rev=739487&r1=739486&r2=739487&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.h (original)
+++ httpd/httpd/trunk/os/unix/unixd.h Sat Jan 31 01:46:56 2009
@@ -80,8 +80,6 @@
 } unixd_config_rec;
 AP_DECLARE_DATA extern unixd_config_rec ap_unixd_config;
 
-AP_DECLARE(int) ap_unixd_setup_child(void);  /* mod_cgid needs this */
-
 #if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC)
|| defined(RLIMIT_AS)
 AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
                                      const char *arg, 



Mime
View raw message