<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15504">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app.h: Restore C++ compatibility for macro AST_DECLARE_APP_ARGS<br><br>This partially reverts commit 3d1bf3c537bba0416f691f48165fdd0a32554e8a,<br>specifically for app.h.<br><br>This works with both gcc 9.3.0 and 10.2.0 now, both for C and C++ (as<br>tested with external modules).<br><br>ASTERISK-29287<br><br>Change-Id: I5b9f02a9b290675682a1d13f1788fdda597c9fca<br>Signed-off-by: Jaco Kroon <jaco@uls.co.za><br>---<br>M include/asterisk/app.h<br>1 file changed, 2 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/app.h b/include/asterisk/app.h</span><br><span>index 91d06aa..6323287 100644</span><br><span>--- a/include/asterisk/app.h</span><br><span>+++ b/include/asterisk/app.h</span><br><span>@@ -1235,10 +1235,8 @@</span><br><span> #define AST_DEFINE_APP_ARGS_TYPE(type, arglist) \</span><br><span>         struct type { \</span><br><span>              unsigned int argc; \</span><br><span style="color: hsl(0, 100%, 40%);">-            union { \</span><br><span style="color: hsl(0, 100%, 40%);">-                       char *argv[sizeof(struct {arglist}) / sizeof(char *)]; \</span><br><span style="color: hsl(0, 100%, 40%);">-                        struct {arglist}; \</span><br><span style="color: hsl(0, 100%, 40%);">-             }; \</span><br><span style="color: hsl(120, 100%, 40%);">+          char *argv[0]; \</span><br><span style="color: hsl(120, 100%, 40%);">+              arglist; \</span><br><span>   }</span><br><span> </span><br><span> /*!</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15504">change 15504</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15504"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I5b9f02a9b290675682a1d13f1788fdda597c9fca </div>
<div style="display:none"> Gerrit-Change-Number: 15504 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Jaco Kroon <jaco@uls.co.za> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>