2020-04-20 12:08:48

by Szymon Janc

Subject: [PATCH 1/4] android: Fix build with GCC 10

status and state are used to hold various enum types depending on test
and callback passed. Define them as int to avoid warnings about enum
assignment from invalid type.
---
android/tester-main.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/tester-main.h b/android/tester-main.h
index 8a7384c57..6bdfdbcdb 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -653,8 +653,8 @@ struct map_inst_data {
* matching with expected step data.
*/
struct bt_callback_data {
- bt_state_t state;
- bt_status_t status;
+ int state;
+ int status;
int num_properties;
bt_property_t *properties;
bt_uuid_t *uuid;
--
2.26.0

2020-04-20 16:44:43

by Gix, Brian

Subject: Re: [PATCH 1/4] android: Fix build with GCC 10

Hi Luiz,

Modulo my question about nul termination on patch 3/4, This patchset resolves all of the GCC 10 build
error/warnings and, I think, should be applied.

On Mon, 2020-04-20 at 14:07 +0200, Szymon Janc wrote:
> status and state are used to hold various enum types depending on test
> and callback passed. Define them as int to avoid warnings about enum
> assignment from invalid type.
> ---
> android/tester-main.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/android/tester-main.h b/android/tester-main.h
> index 8a7384c57..6bdfdbcdb 100644
> --- a/android/tester-main.h
> +++ b/android/tester-main.h
> @@ -653,8 +653,8 @@ struct map_inst_data {
> * matching with expected step data.
> */
> struct bt_callback_data {
> - bt_state_t state;
> - bt_status_t status;
> + int state;
> + int status;
> int num_properties;
> bt_property_t *properties;
> bt_uuid_t *uuid;

2020-04-20 18:02:32

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/4] android: Fix build with GCC 10

Hi Szymon,

On Mon, Apr 20, 2020 at 9:42 AM Gix, Brian <[email protected]> wrote:
>
> Hi Luiz,
>
> Modulo my question about nul termination on patch 3/4, This patchset resolves all of the GCC 10 build
> error/warnings and, I think, should be applied.
>
> On Mon, 2020-04-20 at 14:07 +0200, Szymon Janc wrote:
> > status and state are used to hold various enum types depending on test
> > and callback passed. Define them as int to avoid warnings about enum
> > assignment from invalid type.
> > ---
> > android/tester-main.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/android/tester-main.h b/android/tester-main.h
> > index 8a7384c57..6bdfdbcdb 100644
> > --- a/android/tester-main.h
> > +++ b/android/tester-main.h
> > @@ -653,8 +653,8 @@ struct map_inst_data {
> > * matching with expected step data.
> > */
> > struct bt_callback_data {
> > - bt_state_t state;
> > - bt_status_t status;
> > + int state;
> > + int status;
> > int num_properties;
> > bt_property_t *properties;
> > bt_uuid_t *uuid;

Applied, thanks.

--
Luiz Augusto von Dentz