move asterisk/paths.h outside asterisk.h and into those files

who really need it.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89466 f38db490-d61c-443f-a65b-d21fe96a405b

6 files changed, 10 insertions, 5 deletions

diff --git a/include/asterisk.h b/include/asterisk.h
index 5605d2f3b..cb8499c3c 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -29,7 +29,6 @@
 
 #include "asterisk/compat.h"
 
-#include "asterisk/paths.h"
 #include "asterisk/logger.h"
 
 /* Default to allowing the umask or filesystem ACLs to determine actual file
diff --git a/include/asterisk/ael_structs.h b/include/asterisk/ael_structs.h
index 133c4266a..fa551bf91 100644
--- a/include/asterisk/ael_structs.h
+++ b/include/asterisk/ael_structs.h
@@ -25,6 +25,12 @@
 #ifndef _ASTERISK_AEL_STRUCTS_H
 #define _ASTERISK_AEL_STRUCTS_H
 
+/*
+ * We include asterisk/paths.h here because it is a convenient place
+ * that doesn't require us to rebuild ael files from .fl/.y
+ */
+#include "asterisk/paths.h"
+
 #include "pval.h"
 
 #if !defined(SOLARIS) && !defined(__CYGWIN__)
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index f16c6f0b9..b79c0c29c 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -150,7 +150,6 @@ extern "C" {
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/stringfields.h"
-#include <limits.h>
 
 #define DATASTORE_INHERIT_FOREVER	INT_MAX
 
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 19ae6e9b1..8a3225a16 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -29,6 +29,10 @@
 #include <inttypes.h>
 #endif
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/include/asterisk/paths.h b/include/asterisk/paths.h
index 4c80c3199..f539c078e 100644
--- a/include/asterisk/paths.h
+++ b/include/asterisk/paths.h
@@ -18,8 +18,6 @@
 #ifndef _ASTERISK_PATHS_H
 #define _ASTERISK_PATHS_H
 
-#include <limits.h>
-
 extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
 extern char ast_config_AST_CONFIG_FILE[PATH_MAX];
 extern char ast_config_AST_MODULE_DIR[PATH_MAX];
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 6b55a4272..a9c8d5f0c 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -25,7 +25,6 @@
 
 #include "asterisk/network.h"
 
-#include <limits.h>
 #include <time.h>	/* we want to override localtime_r */
 
 #include "asterisk/lock.h"