aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-08-29 04:37:10 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-08-29 05:56:31 +0800
commitef7dcf5b2abbd92fa5213a3f930ad53b2261adeb (patch)
treedf697531dc16f517d096bf48696fe521de9d1960
parent9c33b2f4847afcbc7b1f968f64474df63a70c6e9 (diff)
downloadgsoc2013-evolution-ef7dcf5b2abbd92fa5213a3f930ad53b2261adeb.tar
gsoc2013-evolution-ef7dcf5b2abbd92fa5213a3f930ad53b2261adeb.tar.gz
gsoc2013-evolution-ef7dcf5b2abbd92fa5213a3f930ad53b2261adeb.tar.bz2
gsoc2013-evolution-ef7dcf5b2abbd92fa5213a3f930ad53b2261adeb.tar.lz
gsoc2013-evolution-ef7dcf5b2abbd92fa5213a3f930ad53b2261adeb.tar.xz
gsoc2013-evolution-ef7dcf5b2abbd92fa5213a3f930ad53b2261adeb.tar.zst
gsoc2013-evolution-ef7dcf5b2abbd92fa5213a3f930ad53b2261adeb.zip
Coding style and whitespace cleanup.
-rw-r--r--libart_lgpl/art_misc.h2
-rw-r--r--libgnomecanvas/gnome-canvas.h12
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;