From 5f3af13a97cd6a9a10cb34f00ff3f5da7407c388 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 15 Feb 2006 19:07:48 +0000
Subject: [PATCH] now that there are no modules that define their own version
of 'struct localuser' (see issue #6216), redefine STANDARD_LOCAL_USER to
empty, and define the localuser structure in module.h (issue #6494)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
include/asterisk/module.h | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index d9d01b2512..2af08533c8 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -264,25 +264,24 @@ void ast_unregister_atexit(void (*func)(void));
/*!
* \brief Standard localuser struct definition.
- *
- * This macro defines a localuser struct. The channel.h file must be included
- * to use this macro because it refrences ast_channel.
+ * used to keep track of channels using a given resource.
*/
-#define STANDARD_LOCAL_USER struct localuser { \
- struct ast_channel *chan; \
- struct localuser *next; \
- }
+struct localuser {
+ struct ast_channel *chan;
+ struct localuser *next;
+};
+
+#define STANDARD_LOCAL_USER /* unused and deprecated now */
/*!
* \brief The localuser declaration.
*
- * This macro should be used in combination with #STANDARD_LOCAL_USER. It
- * creates a localuser mutex and several other variables used for keeping the
- * use count.
+ * This creates a localuser mutex and the head of a list of localusers
+ * that is used for keeping track of channels using a resource, as well
+ * as the use count.
*
* <b>Sample Usage:</b>
* \code
- * STANDARD_LOCAL_USER;
* LOCAL_USER_DECL;
* \endcode
*/
--
GitLab