From cc41d746799c1b61f5f2876450ad146b2cd8f452 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 13 Jul 2005 04:46:33 +0000 Subject: [PATCH] actually show errors when they are there... and fix 1 :) SVN revision: 15763 --- src/bin/e.h | 6 +++--- src/bin/e_ipc_handlers.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/e.h b/src/bin/e.h index 29d35f4dc..7cc3c48d8 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -64,9 +64,9 @@ typedef struct _E_Rect E_Rect; #define E_INSIDE(x, y, xx, yy, ww, hh) (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && ((x) >= (xx)) && ((y) >= (yy))) #define E_CONTAINS(x, y, w, h, xx, yy, ww, hh) (((xx) >= (x)) && (((x) + (w)) <= ((xx) + (ww))) && ((yy) >= (y)) && (((y) + (h)) <= ((yy) + (hh)))) #define E_SPANS_COMMON(x1, w1, x2, w2) (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1))))) -#define E_REALLOC(p, s, n) p = realloc(p, sizeof(s) * n) -#define E_NEW(s, n) calloc(n, sizeof(s)) -#define E_NEW_BIG(s, n) malloc(n * sizeof(s)) +#define E_REALLOC(p, s, n) p = (s *)realloc(p, sizeof(s) * n) +#define E_NEW(s, n) (s *)calloc(n, sizeof(s)) +#define E_NEW_BIG(s, n) (s *)malloc(n * sizeof(s)) #define E_FREE(p) { if (p) {free(p); p = NULL;} } #define E_REMOTE_OPTIONS 1 diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h index 6ff315701..258d6836d 100644 --- a/src/bin/e_ipc_handlers.h +++ b/src/bin/e_ipc_handlers.h @@ -2132,7 +2132,7 @@ break; eb = e_config_binding_mouse_match(&bind); if (!eb) { - eb = E_NEW(E_Config_Binding_Key, 1); + eb = E_NEW(E_Config_Binding_Mouse, 1); e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb); eb->context = bind.context; eb->button = bind.button;