datastore inheritance is a channel feature, so move this definition back

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

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 6166359faf2f78dc716ddfbf069c86fefb8a26d0..9356bd84fe32fa112757c07bfb35029070709d23 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -152,6 +152,8 @@ extern "C" {
 #include "asterisk/stringfields.h"
 #include "asterisk/datastore.h"
 
+#define DATASTORE_INHERIT_FOREVER      INT_MAX
+
 #define AST_MAX_FDS            10
 /*
  * We have AST_MAX_FDS file descriptors in a channel.

diff --git a/include/asterisk/datastore.h b/include/asterisk/datastore.h
index fe1ff8462287071bbab49f3c5f3c44ba1edcef05..6eb4cf2a565ab871f8dea60788112dfe4f8a0fc3 100644 (file)
--- a/include/asterisk/datastore.h
+++ b/include/asterisk/datastore.h
@@ -27,8 +27,6 @@ extern "C" {
 
 #include "asterisk/linkedlists.h"
 
-#define DATASTORE_INHERIT_FOREVER      INT_MAX
-
 /*! \brief Structure for a data store type */
 struct ast_datastore_info {
        const char *type;                       /*!< Type of data store */