diff -ru wmcpuload-1.1.0pre4.orig/src/cpu_linux.c wmcpuload-1.1.0pre4/src/cpu_linux.c --- wmcpuload-1.1.0pre4.orig/src/cpu_linux.c 2005-02-10 07:12:49 +0600 +++ wmcpuload-1.1.0pre4/src/cpu_linux.c 2005-12-09 14:09:28 +0600 @@ -52,7 +52,6 @@ cpu_init(void) { unsigned long long softirq; - int ret; FILE *fp; if (!(fp = fopen("/proc/stat", "r"))) { @@ -60,7 +59,7 @@ exit(1); } - is_linux26 = fscanf(fp, "%*s %*llu %*llu %*llu %*llu %*llu %*llu %llu", + is_linux26 = fscanf(fp, "%*s %*u %*u %*u %*u %*u %*u %llu", &softirq); fclose(fp); @@ -90,7 +89,7 @@ &user, &nice, &system, &idle, &iowait, &irq, &softirq); else - fscanf(fp, "%*s %u %u %u %lu", + fscanf(fp, "%*s %llu %llu %llu %llu", &user, &nice, &system, &idle); } else { char cpu_name[20]; @@ -101,10 +100,10 @@ if (is_linux26) fscanf(fp, "%s %llu %llu %llu %llu %llu %llu %llu", - &cpu_name, &user, &nice, &system, &idle, &iowait, + cpu_name, &user, &nice, &system, &idle, &iowait, &irq, &softirq); else - fscanf(fp, "%s %u %u %u %lu", + fscanf(fp, "%s %llu %llu %llu %llu", cpu_name, &user, &nice, &system, &idle); diff -ru wmcpuload-1.1.0pre4.orig/src/main.c wmcpuload-1.1.0pre4/src/main.c --- wmcpuload-1.1.0pre4.orig/src/main.c 2005-02-12 17:18:22 +0600 +++ wmcpuload-1.1.0pre4/src/main.c 2005-12-09 14:16:52 +0600 @@ -58,6 +58,7 @@ static void draw_digit(int per); static void parse_arguments(int argc, char **argv); static void print_help(char *prog); +Window dockapp_win(void); #if USE_SMP static void draw_cpunumber(void); #endif @@ -221,15 +222,12 @@ int x = 0; Pixmap backdrop; - switch (backlight) { - case LIGHTON: - backdrop = backdrop_on; - x = 2; - break; - case LIGHTOFF: - backdrop = backdrop_off; - x = 0; - break; + if (backlight == LIGHTON) { + backdrop = backdrop_on; + x = 2; + } else { + backdrop = backdrop_off; + x = 0; } dockapp_copy2window(backdrop, 0, 0, 58, 58, 0, 0);