diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-24 17:02:20 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-24 17:02:20 +0000 |
| commit | 328bdebba68bd3235a77e80e90864345580f7857 (patch) | |
| tree | 7f297c1a4221066c943f3bc762c54859e586c01d | |
| parent | aa748f90483028d08e05074b8a746bf1c4a448dd (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@178266 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_dahdiras.c | 5 | ||||
| -rw-r--r-- | res/res_musiconhold.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index 4ecaaa018..85fef72ca 100644 --- 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 9a970f7f2..a1400476c 100644 --- 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 |