summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-06-09 04:40:14 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-06-09 04:40:14 -0500
commit216f78c0ce99f3a49b03aa478be98cdfbf41cb47 (patch)
treec95eb3a3128aa9d6e88c344a0b07bdeeb1cf2d47
parent6ef309423994f73b1d50f094f7108ae361f3557e (diff)
parent797695c5ccbfb242f763d552921a23ce03b779ff (diff)
Merge "Make use of GLOB_BRACE and GLOB_NOMAGIC optional"
-rw-r--r--res/ael/ael.flex6
-rw-r--r--res/ael/ael_lex.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/res/ael/ael.flex b/res/ael/ael.flex
index b1b2bd76d..4e87f3a40 100644
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -80,6 +80,12 @@ ASTERISK_REGISTER_FILE()
#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 a7a20aa60..9fbd66429 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -839,6 +839,12 @@ ASTERISK_REGISTER_FILE()
#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"