diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-25 17:00:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 17:00:17 +0000 |
| commit | 2586499bd95a80b5fc8759f0c36e87b387e88603 (patch) | |
| tree | 3196a7f8af6ae74c60a9f702bac90665fbd8355d | |
| parent | 38af812dc7be5b81033c931e3e5078215954d521 (diff) | |
| parent | e6a214e4fa25664af49abcd502862973efc69de6 (diff) | |
| download | linux-tools-perf-2586499bd95a80b5fc8759f0c36e87b387e88603.tar.gz | |
am e6a214e4: am 31b6aa11: am 39e3915d: Merge "Suppress int-to-pointer-cast warnings."
* commit 'e6a214e4fa25664af49abcd502862973efc69de6':
Suppress int-to-pointer-cast warnings.
| -rw-r--r-- | src/tools/perf/Android.mk | 1 | ||||
| -rw-r--r-- | src/tools/perf/util/parse-events-bison.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/perf/Android.mk b/src/tools/perf/Android.mk index a6cc3f4..e5a0012 100644 --- a/src/tools/perf/Android.mk +++ b/src/tools/perf/Android.mk @@ -140,7 +140,6 @@ common_compiler_flags := \ -std=gnu99 \ -Wno-attributes \ -Wno-implicit-function-declaration \ - -Wno-int-to-pointer-cast \ -Wno-maybe-uninitialized \ -Wno-missing-field-initializers \ -Wno-pointer-arith \ diff --git a/src/tools/perf/util/parse-events-bison.c b/src/tools/perf/util/parse-events-bison.c index eb918da..44364d6 100644 --- a/src/tools/perf/util/parse-events-bison.c +++ b/src/tools/perf/util/parse-events-bison.c @@ -1717,7 +1717,7 @@ yyreduce: ALLOC_LIST(list); ABORT_ON(parse_events_add_breakpoint(list, &data->idx, - (void *) (yyvsp[(2) - (5)].num), (yyvsp[(4) - (5)].str))); + (void *)(uintptr_t) (yyvsp[(2) - (5)].num), (yyvsp[(4) - (5)].str))); (yyval.head) = list; } break; @@ -1732,7 +1732,7 @@ yyreduce: ALLOC_LIST(list); ABORT_ON(parse_events_add_breakpoint(list, &data->idx, - (void *) (yyvsp[(2) - (3)].num), NULL)); + (void *)(uintptr_t) (yyvsp[(2) - (3)].num), NULL)); (yyval.head) = list; } break; |