reverted r528 : it s breaking amd64/x86_64

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 06fdb84f0013b690c9d8d5fe71e4a4a97e9fa0ab..921f067ad4d9dd46ee4790e821281024b3a87f80 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -209,7 +209,7 @@ void get_icon (Task *tsk)
        int i;
        Imlib_Image img = NULL;
        XWMHints *hints = 0;
-       int32_t *data = 0;
+       long *data = 0;
 
        int k;
        for (k=0; k<TASK_STATE_COUNT; ++k) {
@@ -224,7 +224,7 @@ void get_icon (Task *tsk)
        if (data) {
                // get ARGB icon
                int w, h;
-               int32_t *tmp_data;
+               long *tmp_data;
 
                tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1);
 

diff --git a/src/util/window.c b/src/util/window.c
index c6bceb3b46001fbfbb3422b1b375287408d98325..f4ef6a04ac306277e46d6561a7cda780c150ef02 100644 (file)
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -218,7 +218,7 @@ int window_is_active (Window win)
 }
 
 
-int get_icon_count (int32_t *data, int num)
+int get_icon_count (long *data, int num)
 {
        int count, pos, w, h;
 
@@ -236,10 +236,10 @@ int get_icon_count (int32_t *data, int num)
 }
 
 
-int32_t *get_best_icon (int32_t *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
+long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
 {
        int width[icon_count], height[icon_count], pos, i, w, h;
-       int32_t *icon_data[icon_count];
+       long *icon_data[icon_count];
 
        /* List up icons */
        pos = 0;

diff --git a/src/util/window.h b/src/util/window.h
index 79453ad763e4804e27252323c77553c0cc871af7..47798cb8a5a1e788e2404e455e1ec2671ac517e8 100644 (file)
--- a/src/util/window.h
+++ b/src/util/window.h
@@ -22,8 +22,8 @@ int window_is_urgent (Window win);
 int window_is_hidden (Window win);
 int window_is_active (Window win);
 int window_is_skip_taskbar (Window win);
-int get_icon_count (int32_t *data, int num);
-int32_t *get_best_icon (int32_t *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
+int get_icon_count (long *data, int num);
+long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
 void window_maximize_restore (Window win);
 void window_toggle_shade (Window win);
 int window_get_desktop (Window win);