And now make aware... compile/build again :)

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

diff --git a/include/ap_skiplist.h b/include/ap_skiplist.h
index 98f77f3cca01b0ac920eb3833e3df5555b33d595..66b88261819c85eb00cf4039b1a966b0498bdbbb 100644 (file)
--- a/include/ap_skiplist.h
+++ b/include/ap_skiplist.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _SKIPLIST_P_H
-#define _SKIPLIST_P_H
+#ifndef _AP_SKIPLIST_P_H
+#define _AP_SKIPLIST_P_H
 
 #include "apr.h"
 #include "apr_portable.h"

diff --git a/server/mpm/eventopt/config3.m4 b/server/mpm/eventopt/config3.m4
index 061bcbad7f45d9643ef0c83cb205dd06cce216ec..e85008419bdc751a2f095fb8a4451168f67ffbda 100644 (file)
--- a/server/mpm/eventopt/config3.m4
+++ b/server/mpm/eventopt/config3.m4
@@ -8,7 +8,7 @@ if test "$ac_cv_serf" = yes ; then
 fi
 APACHE_SUBST(MOD_MPM_EVENTOPT_LDADD)
 
-APACHE_MPM_MODULE(eventopt, $enable_mpm_eventopt, eventopt.lo fdqueue.lo equeue.lo skiplist.lo,[
+APACHE_MPM_MODULE(eventopt, $enable_mpm_eventopt, eventopt.lo fdqueue.lo equeue.lo ,[
     AC_CHECK_FUNCS(pthread_kill)
 ], , [\$(MOD_MPM_EVENTOPT_LDADD)])
 

diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c
index 8e070bd51ceca46b545a0570ee6520f95e49c8d4..cf42fd9121c20a87cb2217dc83854656901f036e 100644 (file)
--- a/server/mpm/eventopt/eventopt.c
+++ b/server/mpm/eventopt/eventopt.c
@@ -97,7 +97,7 @@
 
 
 #include "equeue.h"
-#include "skiplist.h"
+#include "ap_skiplist.h"
 
 #if HAVE_SERF
 #include "mod_serf.h"

diff --git a/server/skiplist.c b/server/skiplist.c
index c6a8067a19e213a945eaf58581e039c5e00e6926..f79a6f9cc39b1761bf1d8af6c0c932767ba8ae4a 100644 (file)
--- a/server/skiplist.c
+++ b/server/skiplist.c
@@ -23,7 +23,7 @@
  *  can removed if/when needed.
  */
 
-#include "skiplist.h"
+#include "ap_skiplist.h"
 
 #ifndef MIN
 #define MIN(a,b) ((a<b)?(a):(b))