Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1616cdd6 authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Remove the need for -Wno-constant-logical-operand 

Change-Id: Iea44eeed487df3236d9b482b7e5bbc92f7f46797
parent 8e2b3b46

Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ bluetooth_CFLAGS += -DEXPORT_SYMBOL="__attribute__((visibility(\"default\")))" 
#

# Common C/C++ compiler flags.

#

# -Wno-constant-logical-operand is needed for code in l2c_utils.c that is

#  intentional.

# -Wno-gnu-variable-sized-type-not-at-end is needed, because struct BT_HDR

#  is defined as a variable-size header in a struct.

# -Wno-typedef-redefinition is needed because of the way the struct typedef
@@ -37,7 +35,6 @@ bluetooth_CFLAGS += \ 
  -Wall \

  -Wextra \

  -Werror \

  -Wno-constant-logical-operand \

  -Wno-gnu-variable-sized-type-not-at-end \

  -Wno-typedef-redefinition \

  -Wno-unused-parameter \

system/stack/l2cap/l2c_utils.c

+2 −2
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ void l2cu_send_peer_info_rsp (tL2C_LCB *p_lcb, UINT8 remote_id, UINT16 info_type 
    if ((info_type == L2CAP_EXTENDED_FEATURES_INFO_TYPE)

        && (L2CAP_EXTFEA_SUPPORTED_MASK & (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE |

                                           L2CAP_EXTFEA_NO_CRC |L2CAP_EXTFEA_FIXED_CHNLS |

                                           L2CAP_EXTFEA_UCD_RECEPTION )) )

                                           L2CAP_EXTFEA_UCD_RECEPTION )) != 0 )

#endif

    {

        len += L2CAP_EXTENDED_FEATURES_ARRAY_SIZE;
@@ -1164,7 +1164,7 @@ void l2cu_send_peer_info_rsp (tL2C_LCB *p_lcb, UINT8 remote_id, UINT16 info_type 
#else

    if ((info_type == L2CAP_EXTENDED_FEATURES_INFO_TYPE)

        && (L2CAP_EXTFEA_SUPPORTED_MASK & ( L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE

                                          | L2CAP_EXTFEA_UCD_RECEPTION )) )

                                          | L2CAP_EXTFEA_UCD_RECEPTION )) != 0 )

#endif

    {

        UINT16_TO_STREAM (p, L2CAP_INFO_RESP_RESULT_SUCCESS);