diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-09-22 14:19:28 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-09-22 14:19:28 +0200 |
| commit | 4e024bb4f5c8aa8b07459f7fbd65c35122127fd1 (patch) | |
| tree | ccd5835eef17757d3e1c069e391c415c0135023d /android/skin | |
| parent | 1d9873b37d2478554d9d678cd410bd3638c8dab3 (diff) | |
| download | external_qemu-4e024bb4f5c8aa8b07459f7fbd65c35122127fd1.zip external_qemu-4e024bb4f5c8aa8b07459f7fbd65c35122127fd1.tar.gz external_qemu-4e024bb4f5c8aa8b07459f7fbd65c35122127fd1.tar.bz2 | |
Remove compiler warnings when building the emulator.
This forces -Wall during the build. Note that this patch doesn't
remove all warnings, but most of the remaining ones are from upstream anyway.
Change-Id: I8808d8495e99866e156ce5780d2e3c305eab491f
Diffstat (limited to 'android/skin')
| -rw-r--r-- | android/skin/argb.h | 2 | ||||
| -rw-r--r-- | android/skin/scaler.c | 2 | ||||
| -rw-r--r-- | android/skin/trackball.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/android/skin/argb.h b/android/skin/argb.h index b3f0a6d..436a9c8 100644 --- a/android/skin/argb.h +++ b/android/skin/argb.h @@ -134,7 +134,7 @@ mmx_interp255( mmx_t m1, mmx_t m2, mmx_t zero, int alpha ) typedef uint32_t argb_t; -#define ARGB_DECL_ZERO() argb_t _zero = 0 +#define ARGB_DECL_ZERO() /* nothing */ #define ARGB_DECL(x) argb_t x##_ag, x##_rb #define ARGB_DECL2(x1,x2) argb_t x1##_ag, x1##_rb, x2##_ag, x2##_rb #define ARGB_ZERO(x) (x##_ag = x##_rb = 0) diff --git a/android/skin/scaler.c b/android/skin/scaler.c index 59e212f..907c5ca 100644 --- a/android/skin/scaler.c +++ b/android/skin/scaler.c @@ -75,7 +75,7 @@ typedef struct { #define ARGB_SCALE_GENERIC scale_generic #define ARGB_SCALE_05_TO_10 scale_05_to_10 #define ARGB_SCALE_UP_BILINEAR scale_up_bilinear -#define ARGB_SCALE_UP_QUICK_4x4 scale_up_quick_4x4 +/* #define ARGB_SCALE_UP_QUICK_4x4 scale_up_quick_4x4 UNUSED */ #include "android/skin/argb.h" diff --git a/android/skin/trackball.c b/android/skin/trackball.c index b18923a..6fac1cb 100644 --- a/android/skin/trackball.c +++ b/android/skin/trackball.c @@ -12,6 +12,7 @@ #include "android/skin/trackball.h" #include "android/skin/image.h" #include "android/utils/system.h" +#include "user-events.h" #include <math.h> /***********************************************************************/ @@ -448,7 +449,7 @@ trackball_move( TrackBall ball, int dx, int dy ) break; } - kbd_mouse_event(ddx, ddy, 1, 0); + user_event_mouse(ddx, ddy, 1, 0); } rotator_reset( rot, dx, dy ); |