mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-30 10:33:13 +00:00
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
This commit is contained in:
@@ -49,6 +49,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
#include "asterisk/dahdi_compat.h"
|
||||||
|
|
||||||
#ifdef HAVE_CAP
|
#ifdef HAVE_CAP
|
||||||
#include <sys/capability.h>
|
#include <sys/capability.h>
|
||||||
#endif /* HAVE_CAP */
|
#endif /* HAVE_CAP */
|
||||||
@@ -61,8 +64,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||||||
#include "asterisk/module.h"
|
#include "asterisk/module.h"
|
||||||
#include "asterisk/options.h"
|
#include "asterisk/options.h"
|
||||||
|
|
||||||
#include "asterisk/dahdi_compat.h"
|
|
||||||
|
|
||||||
static char *dahdi_app = "DAHDIRAS";
|
static char *dahdi_app = "DAHDIRAS";
|
||||||
static char *zap_app = "ZapRAS";
|
static char *zap_app = "ZapRAS";
|
||||||
|
|
||||||
|
@@ -42,6 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/signal.h>
|
#include <sys/signal.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
@@ -52,6 +53,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||||||
#ifdef SOLARIS
|
#ifdef SOLARIS
|
||||||
#include <thread.h>
|
#include <thread.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "asterisk/dahdi_compat.h"
|
||||||
|
|
||||||
#ifdef HAVE_CAP
|
#ifdef HAVE_CAP
|
||||||
#include <sys/capability.h>
|
#include <sys/capability.h>
|
||||||
#endif /* HAVE_CAP */
|
#endif /* HAVE_CAP */
|
||||||
@@ -73,7 +77,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||||||
#include "asterisk/linkedlists.h"
|
#include "asterisk/linkedlists.h"
|
||||||
#include "asterisk/astobj2.h"
|
#include "asterisk/astobj2.h"
|
||||||
|
|
||||||
#include "asterisk/dahdi_compat.h"
|
|
||||||
|
|
||||||
#define INITIAL_NUM_FILES 8
|
#define INITIAL_NUM_FILES 8
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user