[Asterisk-Dev] Re: [Asterisk-cvs] asterisk/include/asterisk frame.h, 1.35.2.1, 1.35.2.2

[David Woodhouse]

On Tue, 2005-04-05 at 14:43 +0300, Michael Manousos wrote:
> The change of the 'ast_smoother_feed' into a define is not absolutely
> right.

Oops, sorry.

Index: include/asterisk/frame.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/frame.h,v
retrieving revision 1.47
diff -u -p -r1.47 frame.h
--- include/asterisk/frame.h	4 Apr 2005 02:13:40 -0000	1.47
+++ include/asterisk/frame.h	5 Apr 2005 12:18:10 -0000
@@ -362,13 +362,13 @@ extern void ast_smoother_free(struct ast
 extern void ast_smoother_reset(struct ast_smoother *s, int bytes);
 extern int __ast_smoother_feed(struct ast_smoother *s, struct ast_frame *f, int swap);
 extern struct ast_frame *ast_smoother_read(struct ast_smoother *s);
-#define ast_smoother_feed(s,f) do { __ast_smoother_feed(s, f, 0); } while(0)
+#define ast_smoother_feed(s,f) __ast_smoother_feed(s, f, 0)
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-#define ast_smoother_feed_be(s,f) do { __ast_smoother_feed(s, f, 1); } while(0)
-#define ast_smoother_feed_le(s,f) do { __ast_smoother_feed(s, f, 0); } while(0)
+#define ast_smoother_feed_be(s,f) __ast_smoother_feed(s, f, 1)
+#define ast_smoother_feed_le(s,f) __ast_smoother_feed(s, f, 0)
 #else
-#define ast_smoother_feed_be(s,f) do { __ast_smoother_feed(s, f, 0); } while(0)
-#define ast_smoother_feed_le(s,f) do { __ast_smoother_feed(s, f, 1); } while(0)
+#define ast_smoother_feed_be(s,f) __ast_smoother_feed(s, f, 0)
+#define ast_smoother_feed_le(s,f) __ast_smoother_feed(s, f, 1)
 #endif
 
 extern void ast_frame_dump(char *name, struct ast_frame *f, char *prefix);


-- 
dwmw2