You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/03/01 16:36:00 UTC
svn commit: r1451620 - in /httpd/httpd/trunk: include/ap_skiplist.h
server/mpm/eventopt/config3.m4 server/mpm/eventopt/eventopt.c
server/skiplist.c
Author: jim
Date: Fri Mar 1 15:36:00 2013
New Revision: 1451620
URL: http://svn.apache.org/r1451620
Log:
And now make aware... compile/build again :)
Modified:
httpd/httpd/trunk/include/ap_skiplist.h
httpd/httpd/trunk/server/mpm/eventopt/config3.m4
httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
httpd/httpd/trunk/server/skiplist.c
Modified: httpd/httpd/trunk/include/ap_skiplist.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_skiplist.h?rev=1451620&r1=1451619&r2=1451620&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_skiplist.h (original)
+++ httpd/httpd/trunk/include/ap_skiplist.h Fri Mar 1 15:36:00 2013
@@ -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"
Modified: httpd/httpd/trunk/server/mpm/eventopt/config3.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/config3.m4?rev=1451620&r1=1451619&r2=1451620&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/eventopt/config3.m4 (original)
+++ httpd/httpd/trunk/server/mpm/eventopt/config3.m4 Fri Mar 1 15:36:00 2013
@@ -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)])
Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1451620&r1=1451619&r2=1451620&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
+++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Fri Mar 1 15:36:00 2013
@@ -97,7 +97,7 @@
#include "equeue.h"
-#include "skiplist.h"
+#include "ap_skiplist.h"
#if HAVE_SERF
#include "mod_serf.h"
Modified: httpd/httpd/trunk/server/skiplist.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/skiplist.c?rev=1451620&r1=1451619&r2=1451620&view=diff
==============================================================================
--- httpd/httpd/trunk/server/skiplist.c (original)
+++ httpd/httpd/trunk/server/skiplist.c Fri Mar 1 15:36:00 2013
@@ -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))
Re: svn commit: r1451620 - in /httpd/httpd/trunk: include/ap_skiplist.h
server/mpm/eventopt/config3.m4 server/mpm/eventopt/eventopt.c server/skiplist.c
Posted by Eric Covener <co...@gmail.com>.
On Sun, Mar 3, 2013 at 4:47 AM, Mario Brandt <jb...@gmail.com> wrote:
> Hi,
>
> On 1 March 2013 18:20, Plüm, Rüdiger, Vodafone Group
> <ru...@vodafone.com> wrote:
>> Please try make extraclean instead of make clean.
>
> Thanks for the suggestion. I tried that, but I still get that issue.
Happening for me as well -- re-ordering libmain.a vs libevent.a in
the final link of httpd allows it to link. Paging Dr. Jung...
Re: svn commit: r1451620 - in /httpd/httpd/trunk: include/ap_skiplist.h
server/mpm/eventopt/config3.m4 server/mpm/eventopt/eventopt.c server/skiplist.c
Posted by Mario Brandt <jb...@gmail.com>.
Hi,
On 1 March 2013 18:20, Plüm, Rüdiger, Vodafone Group
<ru...@vodafone.com> wrote:
> Please try make extraclean instead of make clean.
Thanks for the suggestion. I tried that, but I still get that issue.
Cheers
Mario
RE: svn commit: r1451620 - in /httpd/httpd/trunk:
include/ap_skiplist.h server/mpm/eventopt/config3.m4
server/mpm/eventopt/eventopt.c server/skiplist.c
Posted by Plüm,
Rüdiger,
Vodafone Group <ru...@vodafone.com>.
Please try make extraclean instead of make clean.
Regards
Rüdiger
-----Original Message-----
From: Mario Brandt [mailto:jblond@gmail.com]
Sent: Friday, March 01, 2013 5:51 PM
To: dev@httpd.apache.org
Subject: Re: svn commit: r1451620 - in /httpd/httpd/trunk: include/ap_skiplist.h server/mpm/eventopt/config3.m4 server/mpm/eventopt/eventopt.c server/skiplist.c
Yepp,
make clean
svn up
./buildconf
./configure
make
sudo make install
Cheers
Mario
On 1 March 2013 17:24, Jim Jagielski <ji...@jagunet.com> wrote:
> Did you do a fresh build?
>
> On Mar 1, 2013, at 11:18 AM, Mario Brandt <jb...@gmail.com> wrote:
>
>> Hi Jim,
>> the compiling runs fine, but the module does not load
>>
>> httpd: Syntax error on line 109 of /opt/apache25/conf/httpd.conf:
>> Cannot load modules/mod_mpm_eventopt.so into server:
>> /opt/apache25/modules/mod_mpm_eventopt.so: undefined symbol:
>> ap_skiplist_insert
>>
>>
>> Cheers
>> Mario
>>
>> On 1 March 2013 16:36, <ji...@apache.org> wrote:
>>> Author: jim
>>> Date: Fri Mar 1 15:36:00 2013
>>> New Revision: 1451620
>>>
>>> URL: http://svn.apache.org/r1451620
>>> Log:
>>> And now make aware... compile/build again :)
>>>
>>> Modified:
>>> httpd/httpd/trunk/include/ap_skiplist.h
>>> httpd/httpd/trunk/server/mpm/eventopt/config3.m4
>>> httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
>>> httpd/httpd/trunk/server/skiplist.c
>>>
>>> Modified: httpd/httpd/trunk/include/ap_skiplist.h
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_skiplist.h?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/include/ap_skiplist.h (original)
>>> +++ httpd/httpd/trunk/include/ap_skiplist.h Fri Mar 1 15:36:00 2013
>>> @@ -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"
>>>
>>> Modified: httpd/httpd/trunk/server/mpm/eventopt/config3.m4
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/config3.m4?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/server/mpm/eventopt/config3.m4 (original)
>>> +++ httpd/httpd/trunk/server/mpm/eventopt/config3.m4 Fri Mar 1 15:36:00 2013
>>> @@ -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)])
>>>
>>>
>>> Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
>>> +++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Fri Mar 1 15:36:00 2013
>>> @@ -97,7 +97,7 @@
>>>
>>>
>>> #include "equeue.h"
>>> -#include "skiplist.h"
>>> +#include "ap_skiplist.h"
>>>
>>> #if HAVE_SERF
>>> #include "mod_serf.h"
>>>
>>> Modified: httpd/httpd/trunk/server/skiplist.c
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/skiplist.c?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/server/skiplist.c (original)
>>> +++ httpd/httpd/trunk/server/skiplist.c Fri Mar 1 15:36:00 2013
>>> @@ -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))
>>>
>>>
>>
>
Re: svn commit: r1451620 - in /httpd/httpd/trunk: include/ap_skiplist.h
server/mpm/eventopt/config3.m4 server/mpm/eventopt/eventopt.c server/skiplist.c
Posted by Mario Brandt <jb...@gmail.com>.
Yepp,
make clean
svn up
./buildconf
./configure
make
sudo make install
Cheers
Mario
On 1 March 2013 17:24, Jim Jagielski <ji...@jagunet.com> wrote:
> Did you do a fresh build?
>
> On Mar 1, 2013, at 11:18 AM, Mario Brandt <jb...@gmail.com> wrote:
>
>> Hi Jim,
>> the compiling runs fine, but the module does not load
>>
>> httpd: Syntax error on line 109 of /opt/apache25/conf/httpd.conf:
>> Cannot load modules/mod_mpm_eventopt.so into server:
>> /opt/apache25/modules/mod_mpm_eventopt.so: undefined symbol:
>> ap_skiplist_insert
>>
>>
>> Cheers
>> Mario
>>
>> On 1 March 2013 16:36, <ji...@apache.org> wrote:
>>> Author: jim
>>> Date: Fri Mar 1 15:36:00 2013
>>> New Revision: 1451620
>>>
>>> URL: http://svn.apache.org/r1451620
>>> Log:
>>> And now make aware... compile/build again :)
>>>
>>> Modified:
>>> httpd/httpd/trunk/include/ap_skiplist.h
>>> httpd/httpd/trunk/server/mpm/eventopt/config3.m4
>>> httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
>>> httpd/httpd/trunk/server/skiplist.c
>>>
>>> Modified: httpd/httpd/trunk/include/ap_skiplist.h
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_skiplist.h?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/include/ap_skiplist.h (original)
>>> +++ httpd/httpd/trunk/include/ap_skiplist.h Fri Mar 1 15:36:00 2013
>>> @@ -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"
>>>
>>> Modified: httpd/httpd/trunk/server/mpm/eventopt/config3.m4
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/config3.m4?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/server/mpm/eventopt/config3.m4 (original)
>>> +++ httpd/httpd/trunk/server/mpm/eventopt/config3.m4 Fri Mar 1 15:36:00 2013
>>> @@ -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)])
>>>
>>>
>>> Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
>>> +++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Fri Mar 1 15:36:00 2013
>>> @@ -97,7 +97,7 @@
>>>
>>>
>>> #include "equeue.h"
>>> -#include "skiplist.h"
>>> +#include "ap_skiplist.h"
>>>
>>> #if HAVE_SERF
>>> #include "mod_serf.h"
>>>
>>> Modified: httpd/httpd/trunk/server/skiplist.c
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/skiplist.c?rev=1451620&r1=1451619&r2=1451620&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/server/skiplist.c (original)
>>> +++ httpd/httpd/trunk/server/skiplist.c Fri Mar 1 15:36:00 2013
>>> @@ -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))
>>>
>>>
>>
>
Re: svn commit: r1451620 - in /httpd/httpd/trunk: include/ap_skiplist.h server/mpm/eventopt/config3.m4 server/mpm/eventopt/eventopt.c server/skiplist.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
Did you do a fresh build?
On Mar 1, 2013, at 11:18 AM, Mario Brandt <jb...@gmail.com> wrote:
> Hi Jim,
> the compiling runs fine, but the module does not load
>
> httpd: Syntax error on line 109 of /opt/apache25/conf/httpd.conf:
> Cannot load modules/mod_mpm_eventopt.so into server:
> /opt/apache25/modules/mod_mpm_eventopt.so: undefined symbol:
> ap_skiplist_insert
>
>
> Cheers
> Mario
>
> On 1 March 2013 16:36, <ji...@apache.org> wrote:
>> Author: jim
>> Date: Fri Mar 1 15:36:00 2013
>> New Revision: 1451620
>>
>> URL: http://svn.apache.org/r1451620
>> Log:
>> And now make aware... compile/build again :)
>>
>> Modified:
>> httpd/httpd/trunk/include/ap_skiplist.h
>> httpd/httpd/trunk/server/mpm/eventopt/config3.m4
>> httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
>> httpd/httpd/trunk/server/skiplist.c
>>
>> Modified: httpd/httpd/trunk/include/ap_skiplist.h
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_skiplist.h?rev=1451620&r1=1451619&r2=1451620&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/include/ap_skiplist.h (original)
>> +++ httpd/httpd/trunk/include/ap_skiplist.h Fri Mar 1 15:36:00 2013
>> @@ -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"
>>
>> Modified: httpd/httpd/trunk/server/mpm/eventopt/config3.m4
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/config3.m4?rev=1451620&r1=1451619&r2=1451620&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/server/mpm/eventopt/config3.m4 (original)
>> +++ httpd/httpd/trunk/server/mpm/eventopt/config3.m4 Fri Mar 1 15:36:00 2013
>> @@ -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)])
>>
>>
>> Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1451620&r1=1451619&r2=1451620&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
>> +++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Fri Mar 1 15:36:00 2013
>> @@ -97,7 +97,7 @@
>>
>>
>> #include "equeue.h"
>> -#include "skiplist.h"
>> +#include "ap_skiplist.h"
>>
>> #if HAVE_SERF
>> #include "mod_serf.h"
>>
>> Modified: httpd/httpd/trunk/server/skiplist.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/skiplist.c?rev=1451620&r1=1451619&r2=1451620&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/server/skiplist.c (original)
>> +++ httpd/httpd/trunk/server/skiplist.c Fri Mar 1 15:36:00 2013
>> @@ -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))
>>
>>
>
Re: svn commit: r1451620 - in /httpd/httpd/trunk: include/ap_skiplist.h
server/mpm/eventopt/config3.m4 server/mpm/eventopt/eventopt.c server/skiplist.c
Posted by Mario Brandt <jb...@gmail.com>.
Hi Jim,
the compiling runs fine, but the module does not load
httpd: Syntax error on line 109 of /opt/apache25/conf/httpd.conf:
Cannot load modules/mod_mpm_eventopt.so into server:
/opt/apache25/modules/mod_mpm_eventopt.so: undefined symbol:
ap_skiplist_insert
Cheers
Mario
On 1 March 2013 16:36, <ji...@apache.org> wrote:
> Author: jim
> Date: Fri Mar 1 15:36:00 2013
> New Revision: 1451620
>
> URL: http://svn.apache.org/r1451620
> Log:
> And now make aware... compile/build again :)
>
> Modified:
> httpd/httpd/trunk/include/ap_skiplist.h
> httpd/httpd/trunk/server/mpm/eventopt/config3.m4
> httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
> httpd/httpd/trunk/server/skiplist.c
>
> Modified: httpd/httpd/trunk/include/ap_skiplist.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_skiplist.h?rev=1451620&r1=1451619&r2=1451620&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/include/ap_skiplist.h (original)
> +++ httpd/httpd/trunk/include/ap_skiplist.h Fri Mar 1 15:36:00 2013
> @@ -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"
>
> Modified: httpd/httpd/trunk/server/mpm/eventopt/config3.m4
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/config3.m4?rev=1451620&r1=1451619&r2=1451620&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/eventopt/config3.m4 (original)
> +++ httpd/httpd/trunk/server/mpm/eventopt/config3.m4 Fri Mar 1 15:36:00 2013
> @@ -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)])
>
>
> Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1451620&r1=1451619&r2=1451620&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
> +++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Fri Mar 1 15:36:00 2013
> @@ -97,7 +97,7 @@
>
>
> #include "equeue.h"
> -#include "skiplist.h"
> +#include "ap_skiplist.h"
>
> #if HAVE_SERF
> #include "mod_serf.h"
>
> Modified: httpd/httpd/trunk/server/skiplist.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/skiplist.c?rev=1451620&r1=1451619&r2=1451620&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/skiplist.c (original)
> +++ httpd/httpd/trunk/server/skiplist.c Fri Mar 1 15:36:00 2013
> @@ -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))
>
>