From 9c4a88068ae5e5029d46774da487ddb67879cba6 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 1 Mar 2013 15:36:00 +0000 Subject: [PATCH] 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 --- include/ap_skiplist.h | 4 ++-- server/mpm/eventopt/config3.m4 | 2 +- server/mpm/eventopt/eventopt.c | 2 +- server/skiplist.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/ap_skiplist.h b/include/ap_skiplist.h index 98f77f3cca..66b8826181 100644 --- 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 061bcbad7f..e85008419b 100644 --- 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 8e070bd51c..cf42fd9121 100644 --- 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 c6a8067a19..f79a6f9cc3 100644 --- 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