[svn-commits] rmudgett: trunk r409683 - in /trunk: ./ include/asterisk/stasis_internal.h

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Mar  4 19:05:02 2014
New Revision: 409683

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409683
Log:
stasis: Made internal_stasis_subscribe() prototype and definition match exactly.
........

Merged revisions 409682 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/stasis_internal.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/include/asterisk/stasis_internal.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/stasis_internal.h?view=diff&rev=409683&r1=409682&r2=409683
==============================================================================
--- trunk/include/asterisk/stasis_internal.h (original)
+++ trunk/include/asterisk/stasis_internal.h Tue Mar  4 19:05:02 2014
@@ -16,9 +16,6 @@
  * at the top of the source tree.
  */
 
-#ifndef STASIS_INTERNAL_H_
-#define STASIS_INTERNAL_H_
-
 /*! \file
  *
  * \brief Internal Stasis APIs.
@@ -33,9 +30,10 @@
  * \author Matt Jordan <mjordan at digium.com>
  */
 
-struct stasis_topic;
-struct stasis_subscription;
-struct stasis_message;
+#include "asterisk/stasis.h"
+
+#ifndef STASIS_INTERNAL_H_
+#define STASIS_INTERNAL_H_
 
 /*!
  * \brief Create a subscription.
@@ -62,7 +60,7 @@
  */
 struct stasis_subscription *internal_stasis_subscribe(
 	struct stasis_topic *topic,
-	void (*stasis_subscription_cb)(void *data, struct stasis_subscription *sub, struct stasis_message *message),
+	stasis_subscription_cb callback,
 	void *data,
 	int needs_mailbox);