lxpanel-ubuntu/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch

   1 From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001
   2 From: Marty Jack <martyj@linux.local>
   3 Date: Thu, 22 Jul 2010 19:46:13 -0400
   4 Subject: [PATCH 3/3] Fix build issue with symbol "alarm" showing up on F14 (Bug3033293)
   5
   6 ---
   7  src/plugins/batt/batt.c |    6 +++---
   8  1 files changed, 3 insertions(+), 3 deletions(-)
   9
  10 diff --git a/src/plugins/batt/batt.c b/src/plugins/batt/batt.c
  11 index 288231f..05c0deb 100644
  12 --- a/src/plugins/batt/batt.c
  13 +++ b/src/plugins/batt/batt.c
  14 @@ -95,7 +95,7 @@ typedef struct {
  15  typedef struct {
  16      char *command;
  17      sem_t *lock;
  18 -} alarm;
  19 +} Alarm;
  20
  21  static void destructor(Plugin *p);
  22  static void update_display(lx_battery *lx_b, gboolean repaint);
  23 @@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint);
  24  /* alarmProcess takes the address of a dynamically allocated alarm struct (which
  25     it must free). It ensures that alarm commands do not run concurrently. */
  26  static void * alarmProcess(void *arg) {
  27 -    alarm *a = (alarm *) arg;
  28 +    Alarm *a = (Alarm *) arg;
  29
  30      sem_wait(a->lock);
  31      system(a->command);
  32 @@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) {
  33         /* Run the alarm command if it isn't already running */
  34         if (alarmCanRun) {
  35
  36 -           alarm *a = (alarm *) malloc(sizeof(alarm));
  37 +           Alarm *a = (Alarm *) malloc(sizeof(Alarm));
  38             a->command = lx_b->alarmCommand;
  39             a->lock = &(lx_b->alarmProcessLock);
  40
  41 --
  42 1.7.1.1
  43