[asterisk-commits] qwell: branch 1.6.0 r113404 - in /branches/1.6.0: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Apr  8 12:01:41 2008
New Revision: 113404

URL: http://svn.digium.com/view/asterisk?view=rev&rev=113404
Log:
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.
........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/asterisk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=113404&r1=113403&r2=113404
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Tue Apr  8 12:01:41 2008
@@ -79,18 +79,21 @@
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
+#include <regex.h>
+
+#if defined(SOLARIS)
+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 <regex.h>
-
-#if defined(SOLARIS)
-int daemon(int, int);  /* defined in libresolv of all places */
-#include <sys/loadavg.h>
-#endif
 
 #include "asterisk/paths.h"	/* we define here the variables so better agree on the prototype */
 #include "asterisk/network.h"
@@ -121,7 +124,6 @@
 #include "asterisk/linkedlists.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/module.h"
-#include "asterisk/zapata.h"
 
 #include "asterisk/doxyref.h"		/* Doxygen documentation */