[asterisk-commits] qwell: branch 1.4 r113402 - /branches/1.4/main/asterisk.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Apr  8 11:56:52 2008
New Revision: 113402

URL: http://svn.digium.com/view/asterisk?view=rev&rev=113402
Log:
Work around some silliness caused by sys/capability.h - this should fix compile errors a number of users have been experiencing.

Modified:
    branches/1.4/main/asterisk.c

Modified: branches/1.4/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/asterisk.c?view=diff&rev=113402&r1=113401&r2=113402
==============================================================================
--- branches/1.4/main/asterisk.c (original)
+++ branches/1.4/main/asterisk.c Tue Apr  8 11:56:52 2008
@@ -80,6 +80,12 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/stat.h>
+
+#ifdef HAVE_ZAPTEL
+#include <sys/ioctl.h>
+#include <zaptel/zaptel.h>
+#endif
+
 #ifdef linux
 #include <sys/prctl.h>
 #ifdef HAVE_CAP
@@ -93,11 +99,6 @@
 #if defined(SOLARIS)
 int daemon(int, int);  /* defined in libresolv of all places */
 #endif
-#endif
-
-#ifdef HAVE_ZAPTEL
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
 #endif
 
 #include "asterisk/logger.h"