diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-08 20:49:59 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-08 20:49:59 +0000 |
| commit | 3016dd272a784848169b5b885d75ebe708f513eb (patch) | |
| tree | 938aece22bc3e864d729ee8dbf118c11f56faf6f | |
| parent | a4c9451bf2348418add4675584a44a31b6fd50a1 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@33114 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | build_tools/menuselect.c | 4 | ||||
| -rw-r--r-- | include/asterisk/compat.h | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c index 9e922f93a..d2427359f 100644 --- 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 cb3678449..8c2c6c4e6 100644 --- 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 |