From: Brian Pane <brianp@apache.org>
Date: Sat, 20 Apr 2002 20:41:33 +0000 (+0000)
Subject: Workaround to get leader/follower compiling on recent Linuxes:
X-Git-Tag: 2.0.36~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=279b274eb4fb92ae7fa4a5ffa6320039dc441989;p=thirdparty%2Fapache%2Fhttpd.git

Workaround to get leader/follower compiling on recent Linuxes:
apr_atomic.h includes some <asm/*.h> header files that clash
with stdlib.h, so I've moved apr_atomic.h so that it's included
after all the other header files.


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

diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index 3581b473d1b..7804684092d 100644
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -72,7 +72,6 @@
 #include "apr_thread_cond.h"
 #include "apr_thread_mutex.h"
 #include "apr_proc_mutex.h"
-#include "apr_atomic.h"
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
@@ -112,6 +111,8 @@
 #include <signal.h>
 #include <limits.h>             /* for INT_MAX */
 
+#include "apr_atomic.h"
+
 /* Limit on the total --- clients will be locked out if more servers than
  * this are needed.  It is intended solely to keep the server from crashing
  * when things get out of hand.