diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 53718d1e5f52ae8b759b2d794ec2d84632e362ea..97011b1b2fc24e6428f079513cef723187a94af0 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -175,7 +175,7 @@ static int dictate_exec(struct ast_channel *chan, const char *data)
ast_queue_frame(chan, &fr);
digit = 0;
}
- if ((f->frametype == AST_FRAME_DTMF)) {
+ if (f->frametype == AST_FRAME_DTMF) {
int got = 1;
switch(mode) {
case DMODE_PLAY:
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e8cea623fff3e3ac2a63937a3617a56704158336..620b767323b8b27de8e3a360dd71041eed222766 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -9099,7 +9099,7 @@ static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms)
if (!res)
res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, ast_channel_language(chan), NULL);
if (!res) {
- if ((vms->newmessages == 1)) {
+ if (vms->newmessages == 1) {
res = ast_play_and_wait(chan, "vm-INBOX");
if (!res)
res = ast_play_and_wait(chan, "vm-message");
@@ -9113,7 +9113,7 @@ static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms)
res = ast_play_and_wait(chan, "vm-youhave");
if (!res)
res = ast_say_number(chan, vms->oldmessages, AST_DIGIT_ANY, ast_channel_language(chan), NULL);
- if ((vms->oldmessages == 1)){
+ if (vms->oldmessages == 1){
res = ast_play_and_wait(chan, "vm-Old");
if (!res)
res = ast_play_and_wait(chan, "vm-message");
@@ -9344,7 +9344,7 @@ static int vm_intro_en(struct ast_channel *chan, struct vm_state *vms)
if ((vms->oldmessages || vms->newmessages) && !res) {
res = ast_play_and_wait(chan, "vm-and");
} else if (!res) {
- if ((vms->urgentmessages == 1))
+ if (vms->urgentmessages == 1)
res = ast_play_and_wait(chan, "vm-message");
else
res = ast_play_and_wait(chan, "vm-messages");
@@ -9357,7 +9357,7 @@ static int vm_intro_en(struct ast_channel *chan, struct vm_state *vms)
if (vms->oldmessages && !res)
res = ast_play_and_wait(chan, "vm-and");
else if (!res) {
- if ((vms->newmessages == 1))
+ if (vms->newmessages == 1)
res = ast_play_and_wait(chan, "vm-message");
else
res = ast_play_and_wait(chan, "vm-messages");
@@ -9509,7 +9509,7 @@ static int vm_intro_se(struct ast_channel *chan, struct vm_state *vms)
}
if (vms->newmessages) {
- if ((vms->newmessages == 1)) {
+ if (vms->newmessages == 1) {
res = ast_play_and_wait(chan, "digits/ett");
res = res ? res : ast_play_and_wait(chan, "vm-nytt");
res = res ? res : ast_play_and_wait(chan, "vm-message");
@@ -9553,7 +9553,7 @@ static int vm_intro_no(struct ast_channel *chan, struct vm_state *vms)
}
if (vms->newmessages) {
- if ((vms->newmessages == 1)) {
+ if (vms->newmessages == 1) {
res = ast_play_and_wait(chan, "digits/1");
res = res ? res : ast_play_and_wait(chan, "vm-ny");
res = res ? res : ast_play_and_wait(chan, "vm-message");
@@ -9588,7 +9588,7 @@ static int vm_intro_de(struct ast_channel *chan, struct vm_state *vms)
res = ast_play_and_wait(chan, "vm-youhave");
if (!res) {
if (vms->newmessages) {
- if ((vms->newmessages == 1))
+ if (vms->newmessages == 1)
res = ast_play_and_wait(chan, "digits/1F");
else
res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan));
@@ -9597,7 +9597,7 @@ static int vm_intro_de(struct ast_channel *chan, struct vm_state *vms)
if (vms->oldmessages && !res)
res = ast_play_and_wait(chan, "vm-and");
else if (!res) {
- if ((vms->newmessages == 1))
+ if (vms->newmessages == 1)
res = ast_play_and_wait(chan, "vm-message");
else
res = ast_play_and_wait(chan, "vm-messages");
@@ -9644,7 +9644,7 @@ static int vm_intro_es(struct ast_channel *chan, struct vm_state *vms)
if (!res) {
if (vms->newmessages) {
if (!res) {
- if ((vms->newmessages == 1)) {
+ if (vms->newmessages == 1) {
res = ast_play_and_wait(chan, "digits/1M");
if (!res)
res = ast_play_and_wait(chan, "vm-message");
@@ -9695,7 +9695,7 @@ static int vm_intro_pt_BR(struct ast_channel *chan, struct vm_state *vms) {
if (vms->newmessages) {
if (!res)
res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, ast_channel_language(chan), "f");
- if ((vms->newmessages == 1)) {
+ if (vms->newmessages == 1) {
if (!res)
res = ast_play_and_wait(chan, "vm-message");
if (!res)
@@ -9741,7 +9741,7 @@ static int vm_intro_fr(struct ast_channel *chan, struct vm_state *vms)
if (vms->oldmessages && !res)
res = ast_play_and_wait(chan, "vm-and");
else if (!res) {
- if ((vms->newmessages == 1))
+ if (vms->newmessages == 1)
res = ast_play_and_wait(chan, "vm-message");
else
res = ast_play_and_wait(chan, "vm-messages");
@@ -9788,7 +9788,7 @@ static int vm_intro_nl(struct ast_channel *chan, struct vm_state *vms)
if (vms->oldmessages && !res)
res = ast_play_and_wait(chan, "vm-and");
else if (!res) {
- if ((vms->newmessages == 1))
+ if (vms->newmessages == 1)
res = ast_play_and_wait(chan, "vm-message");
else
res = ast_play_and_wait(chan, "vm-messages");
@@ -9831,7 +9831,7 @@ static int vm_intro_pt(struct ast_channel *chan, struct vm_state *vms)
if (vms->newmessages) {
res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, ast_channel_language(chan), "f");
if (!res) {
- if ((vms->newmessages == 1)) {
+ if (vms->newmessages == 1) {
res = ast_play_and_wait(chan, "vm-message");
if (!res)
res = ast_play_and_wait(chan, "vm-INBOXs");
@@ -9897,7 +9897,7 @@ static int vm_intro_cs(struct ast_channel *chan, struct vm_state *vms)
res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan));
}
if (!res) {
- if ((vms->newmessages == 1))
+ if (vms->newmessages == 1)
res = ast_play_and_wait(chan, "vm-novou");
if ((vms->newmessages) > 1 && (vms->newmessages < 5))
res = ast_play_and_wait(chan, "vm-nove");
@@ -9907,7 +9907,7 @@ static int vm_intro_cs(struct ast_channel *chan, struct vm_state *vms)
if (vms->oldmessages && !res)
res = ast_play_and_wait(chan, "vm-and");
else if (!res) {
- if ((vms->newmessages == 1))
+ if (vms->newmessages == 1)
res = ast_play_and_wait(chan, "vm-zpravu");
if ((vms->newmessages) > 1 && (vms->newmessages < 5))
res = ast_play_and_wait(chan, "vm-zpravy");
@@ -9918,7 +9918,7 @@ static int vm_intro_cs(struct ast_channel *chan, struct vm_state *vms)
if (!res && vms->oldmessages) {
res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan));
if (!res) {
- if ((vms->oldmessages == 1))
+ if (vms->oldmessages == 1)
res = ast_play_and_wait(chan, "vm-starou");
if ((vms->oldmessages) > 1 && (vms->oldmessages < 5))
res = ast_play_and_wait(chan, "vm-stare");
@@ -9926,7 +9926,7 @@ static int vm_intro_cs(struct ast_channel *chan, struct vm_state *vms)
res = ast_play_and_wait(chan, "vm-starych");
}
if (!res) {
- if ((vms->oldmessages == 1))
+ if (vms->oldmessages == 1)
res = ast_play_and_wait(chan, "vm-zpravu");
if ((vms->oldmessages) > 1 && (vms->oldmessages < 5))
res = ast_play_and_wait(chan, "vm-zpravy");
diff --git a/main/channel.c b/main/channel.c
index c8abeb215366c63c587434a5ab348cd3781d5f1c..5efa1187040b117c74a45b4b763020f25c7a6bb7 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4112,14 +4112,14 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
ast_frfree(f);
f = &ast_null_frame;
}
- } else if ((f->frametype == AST_FRAME_VOICE) && ast_format_cap_iscompatible_format(ast_channel_nativeformats(chan), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
+ } else if (f->frametype == AST_FRAME_VOICE && ast_format_cap_iscompatible_format(ast_channel_nativeformats(chan), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
/* This frame is not one of the current native formats -- drop it on the floor */
struct ast_str *codec_buf = ast_str_alloca(64);
ast_log(LOG_NOTICE, "Dropping incompatible voice frame on %s of format %s since our native format has changed to %s\n",
ast_channel_name(chan), ast_format_get_name(f->subclass.format), ast_format_cap_get_names(ast_channel_nativeformats(chan), &codec_buf));
ast_frfree(f);
f = &ast_null_frame;
- } else if ((f->frametype == AST_FRAME_VOICE)) {
+ } else if (f->frametype == AST_FRAME_VOICE) {
/* Send frame to audiohooks if present */
if (ast_channel_audiohooks(chan)) {
struct ast_frame *old_frame = f;
diff --git a/res/Makefile b/res/Makefile
index 403863426cd4b7222d3b7d14d9946b473ee12726..b98fb8e425932ebb191443567f25f0c0d194d60d 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -33,6 +33,9 @@ ael/ael_lex.o: _ASTCFLAGS+=-I. -Iael -Wno-unused
ael/ael.tab.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h
ael/ael.tab.o: _ASTCFLAGS+=-I. -Iael -DYYENABLE_NLS=0
+ ifneq ($(AST_CLANG_BLOCKS),)
+ _ASTCFLAGS+=-Wno-parentheses-equality
+ endif
$(if $(filter res_ais,$(EMBEDDED_MODS)),modules.link,res_ais.so): ais/clm.o ais/evt.o
ais/clm.o ais/evt.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ais)
diff --git a/utils/Makefile b/utils/Makefile
index 8fb1a29670c5347c950e5a4c993ecc85f8836f75..af216738b5156e24c5f4da27715ee59e79181f65 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -139,6 +139,9 @@ aelbison.c: $(ASTTOPDIR)/res/ael/ael.tab.c
$(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
$(CMD_PREFIX) cp "$<" "$@"
aelbison.o: _ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0
+ ifneq ($(AST_CLANG_BLOCKS),)
+ _ASTCFLAGS+=-Wno-parentheses-equality
+ endif
pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c
$(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"