[svn-commits] trunk r33114 - in /trunk: build_tools/menuselect.c include/asterisk/compat.h

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Jun  8 15:49:59 2006
New Revision: 33114

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

Modified:
    trunk/build_tools/menuselect.c
    trunk/include/asterisk/compat.h

Modified: trunk/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect.c?rev=33114&r1=33113&r2=33114&view=diff
==============================================================================
--- trunk/build_tools/menuselect.c (original)
+++ trunk/build_tools/menuselect.c Thu Jun  8 15:49:59 2006
@@ -24,12 +24,12 @@
  * \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"

Modified: trunk/include/asterisk/compat.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/compat.h?rev=33114&r1=33113&r2=33114&view=diff
==============================================================================
--- trunk/include/asterisk/compat.h (original)
+++ trunk/include/asterisk/compat.h Thu Jun  8 15:49:59 2006
@@ -15,6 +15,9 @@
 
 #ifndef _COMPAT_H
 #define _COMPAT_H
+
+#include <inttypes.h>
+#include <sys/types.h>
 
 #ifndef HAVE_STRSEP
 char* strsep(char** str, const char* delims);
@@ -81,18 +84,6 @@
 #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