Change include order to make compile on Centos 5 with DAHDI

If BIT_TYPES_DEFINED gets defined before linux/types.h is included, the
__s32 type doesn't get defined

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

diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 4ecaaa018efd29a559f182073561594e8769979d..85fef72ca7280ed352dd536b60c68881be701e61 100644 (file)
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -49,6 +49,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
+
+#include "asterisk/dahdi_compat.h"
+
 #ifdef HAVE_CAP
 #include <sys/capability.h>
 #endif /* HAVE_CAP */
@@ -61,8 +64,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 
-#include "asterisk/dahdi_compat.h"
-
 static char *dahdi_app = "DAHDIRAS";
 static char *zap_app = "ZapRAS";
 

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 9a970f7f28537014097d0ba8447924a0f2c6e872..a1400476c609cc6f00bd3d09ba99607e7fdc5698 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -42,6 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
+
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
@@ -52,6 +53,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #ifdef SOLARIS
 #include <thread.h>
 #endif
+
+#include "asterisk/dahdi_compat.h"
+
 #ifdef HAVE_CAP
 #include <sys/capability.h>
 #endif /* HAVE_CAP */
@@ -73,7 +77,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/linkedlists.h"
 #include "asterisk/astobj2.h"
 
-#include "asterisk/dahdi_compat.h"
 
 #define INITIAL_NUM_FILES   8