always include inttypes.h and sys/types.h in asterisk/compat.h to fix a build

problem on mac and place asterisk.h back at the top of menuselect.c

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

diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index 9e922f93a95fdeec4c561cf040fe90206d642ccf..d2427359f3636570efb418e6b84c62ce3e2b3839 100644 (file)
--- a/build_tools/menuselect.c
+++ b/build_tools/menuselect.c
@@ -24,13 +24,13 @@
  * \brief A menu-driven system for Asterisk module selection
  */
 
+#include "asterisk.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "asterisk.h"
-
 #include "mxml/mxml.h"
 #include "menuselect.h"
 

diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index cb367844990f69e4bdede9e9d82dee229253d01d..8c2c6c4e685a2a71f413b588ce3dc0e14d5a6f44 100644 (file)
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -16,6 +16,9 @@
 #ifndef _COMPAT_H
 #define _COMPAT_H
 
+#include <inttypes.h>
+#include <sys/types.h>
+
 #ifndef HAVE_STRSEP
 char* strsep(char** str, const char* delims);
 #endif
@@ -81,18 +84,6 @@ typedef unsigned int u_int32_t;
 #endif
 #endif /* __CYGWIN__ */
 
-#ifdef __linux__
-#include <inttypes.h>
-#endif
-
-#ifdef __Darwin__
-#include <inttypes.h>
-#endif
-
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#endif
-
 #ifdef __CYGWIN__
 typedef unsigned long long uint64_t;
 #endif