From: Paul Querna <pquerna@apache.org>
Date: Tue, 28 Oct 2008 16:06:25 +0000 (+0000)
Subject: * simple_io.c line 111 and 145 cause a build falure with --enable-maintainer-mode .
X-Git-Tag: 2.3.0~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07c03d4ff2b7835039b2d4332b8e3299b132caf4;p=thirdparty%2Fapache%2Fhttpd.git

* simple_io.c line 111 and 145 cause a build falure with --enable-maintainer-mode .
* simple_children.c should include simple_children.h.
* simple_io_timeot_cb should be static.

Noticed by: Takashi Sato


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

diff --git a/server/mpm/simple/simple_children.c b/server/mpm/simple/simple_children.c
index 8bd385e531f..87c80fedf0e 100644
--- a/server/mpm/simple/simple_children.c
+++ b/server/mpm/simple/simple_children.c
@@ -19,6 +19,7 @@
 #include "simple_types.h"
 #include "simple_event.h"
 #include "simple_run.h"
+#include "simple_children.h"
 #include "apr_hash.h"
 
 #define SPAWN_CHILDREN_INTERVAL (apr_time_from_sec(5))
diff --git a/server/mpm/simple/simple_io.c b/server/mpm/simple/simple_io.c
index 561185b74ea..c569c167009 100644
--- a/server/mpm/simple/simple_io.c
+++ b/server/mpm/simple/simple_io.c
@@ -28,7 +28,7 @@
 #include "scoreboard.h"
 #include "http_vhost.h"
 
-void
+static void
 simple_io_timeot_cb(simple_core_t *sc,
                            void *baton)
 {
@@ -108,7 +108,7 @@ simple_io_process(simple_conn_t *scon)
         if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                        "apr_pollcb_add: failed in write completion");
-          AP_DEBUG_ASSERT(rc == APR_SUCCESS);
+          AP_DEBUG_ASSERT(rv == APR_SUCCESS);
         }
         return APR_SUCCESS;
       }
@@ -142,7 +142,7 @@ simple_io_process(simple_conn_t *scon)
       if (rv) {
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
                      "process_socket: apr_pollset_add failure in read request line");
-        AP_DEBUG_ASSERT(rc == APR_SUCCESS);
+        AP_DEBUG_ASSERT(rv == APR_SUCCESS);
       }
 
       return APR_SUCCESS;