Merged revisions 113403 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r113403 | qwell | 2008-04-08 12:00:55 -0500 (Tue, 08 Apr 2008) | 9 lines

Merged revisions 113402 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113402 | qwell | 2008-04-08 11:56:52 -0500 (Tue, 08 Apr 2008) | 1 line

Work around some silliness caused by sys/capability.h - this should fix compile errors a number of users have been experiencing.
........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@113404 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/asterisk.c

@@ -79,12 +79,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
-#ifdef linux
-#include <sys/prctl.h>
-#ifdef HAVE_CAP
-#include <sys/capability.h>
-#endif /* HAVE_CAP */
-#endif /* linux */
 #include <regex.h>
 
 #if defined(SOLARIS)
@@ -92,6 +86,15 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #include <sys/loadavg.h>
 #endif
 
+#include "asterisk/zapata.h"
+
+#ifdef linux
+#include <sys/prctl.h>
+#ifdef HAVE_CAP
+#include <sys/capability.h>
+#endif /* HAVE_CAP */
+#endif /* linux */
+
 #include "asterisk/paths.h"	/* we define here the variables so better agree on the prototype */
 #include "asterisk/network.h"
 #include "asterisk/cli.h"
@@ -121,7 +124,6 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #include "asterisk/linkedlists.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/module.h"
-#include "asterisk/zapata.h"
 
 #include "asterisk/doxyref.h"		/* Doxygen documentation */