diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2011-08-08 19:03:33 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2011-08-08 19:03:33 -0400 |
| commit | c0bee7c9ad54b357bcac6dafa565ff1eeac76d93 (patch) | |
| tree | 030307eb3fb26589aadd376acbc09328d7250bba | |
| parent | e6acb6704d4420ddc21adf47fbb20a256955d998 (diff) | |
track: Remove duplicate event count constants.
| -rw-r--r-- | src/icon.c | 10 | ||||
| -rw-r--r-- | src/track.h | 5 |
2 files changed, 5 insertions, 10 deletions
@@ -28,16 +28,16 @@ #include "sclient.h" #include "icon.h" -static unsigned int events[NUM_EVENTS]; -static unsigned char global_events[NUM_EVENTS]; +static unsigned int events[LINPICKER_NUM_EVENTS]; +static unsigned char global_events[LINPICKER_NUM_EVENTS]; -static IDirectFBSurface *icons[NUM_EVENTS]; -static unsigned char icon_data[NUM_EVENTS][ICON_WIDTH * ICON_HEIGHT]; +static IDirectFBSurface *icons[LINPICKER_NUM_EVENTS]; +static unsigned char icon_data[LINPICKER_NUM_EVENTS][ICON_WIDTH * ICON_HEIGHT]; int icon_set(struct display *d, unsigned icon_id, int set) { - if (icon_id >= CLIENT_EVENTS) + if (icon_id >= LINPICKER_CLIENT_EVENTS) return -1; /* XXX check the client's permission to set the event */ diff --git a/src/track.h b/src/track.h index 76d4d84..3c598f9 100644 --- a/src/track.h +++ b/src/track.h @@ -61,11 +61,6 @@ #define LINPICKER_CLIENT_EVENTS 2 #define LINPICKER_NUM_EVENTS 4 -/* Event counts */ -#define CLIENT_EVENTS 2 -#define SERVER_EVENTS 2 -#define NUM_EVENTS (CLIENT_EVENTS + SERVER_EVENTS) - struct lin_message { uint32_t type; |