blob: 2c4d3d10df62b99885ed7f79a3ddd06525e1e655 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- lxpanel-0.5.5/src/plugins/batt/batt.c 2010-02-06 20:45:38.000000000 +0100
+++ lxpanel-0.5.5/src/plugins/batt/batt.c.new 2010-06-16 14:19:56.000000000 +0200
@@ -95,7 +95,7 @@
typedef struct {
char *command;
sem_t *lock;
-} alarm;
+} lx_alarm;
static void destructor(Plugin *p);
static void update_display(lx_battery *lx_b, gboolean repaint);
@@ -103,7 +103,7 @@
/* alarmProcess takes the address of a dynamically allocated alarm struct (which
it must free). It ensures that alarm commands do not run concurrently. */
static void * alarmProcess(void *arg) {
- alarm *a = (alarm *) arg;
+ lx_alarm *a = (lx_alarm *) arg;
sem_wait(a->lock);
system(a->command);
@@ -157,7 +157,7 @@
/* Run the alarm command if it isn't already running */
if (alarmCanRun) {
- alarm *a = (alarm *) malloc(sizeof(alarm));
+ lx_alarm *a = (lx_alarm *) malloc(sizeof(lx_alarm));
a->command = lx_b->alarmCommand;
a->lock = &(lx_b->alarmProcessLock);
|
