[asterisk-commits] twilson: branch 1.4 r178266 - in /branches/1.4: apps/ res/

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Feb 24 11:02:20 2009
New Revision: 178266

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

Modified:
    branches/1.4/apps/app_dahdiras.c
    branches/1.4/res/res_musiconhold.c

Modified: branches/1.4/apps/app_dahdiras.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/apps/app_dahdiras.c?view=diff&rev=178266&r1=178265&r2=178266
==============================================================================
--- branches/1.4/apps/app_dahdiras.c (original)
+++ branches/1.4/apps/app_dahdiras.c Tue Feb 24 11:02:20 2009
@@ -49,6 +49,9 @@
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
+
+#include "asterisk/dahdi_compat.h"
+
 #ifdef HAVE_CAP
 #include <sys/capability.h>
 #endif /* HAVE_CAP */
@@ -60,8 +63,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-
-#include "asterisk/dahdi_compat.h"
 
 static char *dahdi_app = "DAHDIRAS";
 static char *zap_app = "ZapRAS";

Modified: branches/1.4/res/res_musiconhold.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/res/res_musiconhold.c?view=diff&rev=178266&r1=178265&r2=178266
==============================================================================
--- branches/1.4/res/res_musiconhold.c (original)
+++ branches/1.4/res/res_musiconhold.c Tue Feb 24 11:02:20 2009
@@ -42,6 +42,7 @@
 #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 @@
 #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 @@
 #include "asterisk/linkedlists.h"
 #include "asterisk/astobj2.h"
 
-#include "asterisk/dahdi_compat.h"
 
 #define INITIAL_NUM_FILES   8