aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-08 16:56:52 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-08 16:56:52 +0000
commit044c18f7f720e91ae66c1b26f8adb48e92d54fe7 (patch)
tree0261bea02d94f8fb697ed5b467c01a1955f33413 /main
parentfcb46e8b68e6b82238eddb1d37c4d624fbd598d4 (diff)
Work around some silliness caused by sys/capability.h - this should fix compile errors a number of users have been experiencing.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@113402 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/asterisk.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 219c1911d..ca6396827 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -80,6 +80,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#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
@@ -95,11 +101,6 @@ 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"
#include "asterisk/options.h"
#include "asterisk/cli.h"