[asterisk-commits] Make use of GLOB BRACE and GLOB NOMAGIC optional (asterisk[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: Make use of GLOB_BRACE and GLOB_NOMAGIC optional
......................................................................


Make use of GLOB_BRACE and GLOB_NOMAGIC optional

These flags are non-portable GNU extensions. Make their use
optional. This fixes complication error on e.g. musl c-library
based systems.

Change-Id: I0aa06efc62aa8995f091445c8b762a75a91042f3
---
M res/ael/ael.flex
M res/ael/ael_lex.c
2 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/res/ael/ael.flex b/res/ael/ael.flex
index b1b2bd7..4e87f3a 100644
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -80,6 +80,12 @@
 #if !defined(GLOB_ABORTED)
 #define GLOB_ABORTED GLOB_ABEND
 #endif
+#if !defined(GLOB_BRACE)
+#define GLOB_BRACE 0
+#endif
+#if !defined(GLOB_NOMAGIC)
+#define GLOB_NOMAGIC 0
+#endif
 
 #include "asterisk/logger.h"
 #include "asterisk/utils.h"
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c
index a7a20aa..9fbd664 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -839,6 +839,12 @@
 #if !defined(GLOB_ABORTED)
 #define GLOB_ABORTED GLOB_ABEND
 #endif
+#if !defined(GLOB_BRACE)
+#define GLOB_BRACE 0
+#endif
+#if !defined(GLOB_NOMAGIC)
+#define GLOB_NOMAGIC 0
+#endif
 
 #include "asterisk/logger.h"
 #include "asterisk/utils.h"

-- 
To view, visit https://gerrit.asterisk.org/2936
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0aa06efc62aa8995f091445c8b762a75a91042f3
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Timo Teräs <timo.teras at iki.fi>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>