aboutsummaryrefslogtreecommitdiffstats
path: root/libart_lgpl/art_misc.h
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-06-20 18:56:06 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-06-20 20:06:19 +0800
commit5d0878967ee21a039ef599222b1cf3eb606354d4 (patch)
tree790cfcbf63fea7292740f182dd612ab20244f6e8 /libart_lgpl/art_misc.h
parentf5f2132d60cdd1884c6343f759aadfd38a159e04 (diff)
downloadgsoc2013-evolution-5d0878967ee21a039ef599222b1cf3eb606354d4.tar
gsoc2013-evolution-5d0878967ee21a039ef599222b1cf3eb606354d4.tar.gz
gsoc2013-evolution-5d0878967ee21a039ef599222b1cf3eb606354d4.tar.bz2
gsoc2013-evolution-5d0878967ee21a039ef599222b1cf3eb606354d4.tar.lz
gsoc2013-evolution-5d0878967ee21a039ef599222b1cf3eb606354d4.tar.xz
gsoc2013-evolution-5d0878967ee21a039ef599222b1cf3eb606354d4.tar.zst
gsoc2013-evolution-5d0878967ee21a039ef599222b1cf3eb606354d4.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'libart_lgpl/art_misc.h')
-rw-r--r--libart_lgpl/art_misc.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/libart_lgpl/art_misc.h b/libart_lgpl/art_misc.h
index b0a445b238..054b912dbd 100644
--- a/libart_lgpl/art_misc.h
+++ b/libart_lgpl/art_misc.h
@@ -29,9 +29,9 @@
#ifdef __cplusplus
extern "C" {
#endif
-void *art_alloc(size_t size);
-void art_free(void *ptr);
-void *art_realloc(void *ptr, size_t size);
+gpointer art_alloc(gsize size);
+void art_free(gpointer ptr);
+gpointer art_realloc(gpointer ptr, gsize size);
#ifdef __cplusplus
}
#endif /* __cplusplus */
@@ -45,9 +45,11 @@ void *art_realloc(void *ptr, size_t 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); } else { max = 1; p = art_new(type, 1); } } while (0)
+#define art_expand(p, type, max) \
+ do { if(max) { p = art_renew (p, type, max <<= 1); } \
+ else { max = 1; p = art_new(type, 1); } } while (0)
-typedef int art_boolean;
+typedef gint art_boolean;
#define ART_FALSE 0
#define ART_TRUE 1
@@ -81,10 +83,10 @@ typedef guint16 art_u16;
typedef guint32 art_u32;
void ART_GNUC_NORETURN
-art_die (const char *fmt, ...) ART_GNUC_PRINTF (1, 2);
+art_die (const gchar *fmt, ...) ART_GNUC_PRINTF (1, 2);
void
-art_warn (const char *fmt, ...) ART_GNUC_PRINTF (1, 2);
+art_warn (const gchar *fmt, ...) ART_GNUC_PRINTF (1, 2);
#ifdef __cplusplus
}