diff options
| -rw-r--r-- | libart_lgpl/art_misc.h | 2 | ||||
| -rw-r--r-- | libgnomecanvas/gnome-canvas.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libart_lgpl/art_misc.h b/libart_lgpl/art_misc.h index 054b912dbd..de91432c5a 100644 --- a/libart_lgpl/art_misc.h +++ b/libart_lgpl/art_misc.h @@ -46,7 +46,7 @@ gpointer art_realloc(gpointer ptr, gsize size); /* This one must be used carefully - in particular, p and max should be variables. They can also be pstruct->el lvalues. */ #define art_expand(p, type, max) \ - do { if(max) { p = art_renew (p, type, max <<= 1); } \ + do { if (max) { p = art_renew (p, type, max <<= 1); } \ else { max = 1; p = art_new(type, 1); } } while (0) typedef gint art_boolean; diff --git a/libgnomecanvas/gnome-canvas.h b/libgnomecanvas/gnome-canvas.h index 7d01321ff3..365b625dab 100644 --- a/libgnomecanvas/gnome-canvas.h +++ b/libgnomecanvas/gnome-canvas.h @@ -54,14 +54,14 @@ G_BEGIN_DECLS * [0, 255]. */ -#define GNOME_CANVAS_COLOR(r, g, b) ((((unsigned int) (r) & 0xff) << 24) \ - | (((unsigned int) (g) & 0xff) << 16) \ - | (((unsigned int) (b) & 0xff) << 8) \ +#define GNOME_CANVAS_COLOR(r, g, b) ((((guint) (r) & 0xff) << 24) \ + | (((guint) (g) & 0xff) << 16) \ + | (((guint) (b) & 0xff) << 8) \ | 0xff) -#define GNOME_CANVAS_COLOR_A(r, g, b, a) ((((unsigned int) (r) & 0xff) << 24) \ - | (((unsigned int) (g) & 0xff) << 16) \ - | (((unsigned int) (b) & 0xff) << 8) \ +#define GNOME_CANVAS_COLOR_A(r, g, b, a) ((((guint) (r) & 0xff) << 24) \ + | (((guint) (g) & 0xff) << 16) \ + | (((guint) (b) & 0xff) << 8) \ | ((guint) (a) & 0xff)) typedef struct _GnomeCanvas GnomeCanvas; |