garray: Add support adding literal values

GArray's g_array_append_val(), g_array_prened_val() and g_array_insert_val()
macros required an user to use literals to add a new value.

This could be inconvenient at times, but it's possible to avoid this with
recent compilers, in fact in case glib_typeof is defined we can take
advantage of it, to initialize a temporary variable to store the literal
value and pass its address to the actual function.

1 files changed, 30 insertions, 3 deletions

diff --git a/glib/garray.h b/glib/garray.h
index 2300e5f58..5b9c6752a 100644
--- a/glib/garray.h
+++ b/glib/garray.h
@@ -32,6 +32,7 @@
 #endif
 
 #include <glib/gtypes.h>
+#include <glib/glib-typeof.h>
 
 G_BEGIN_DECLS
 
@@ -63,9 +64,35 @@ struct _GPtrArray
  * order by moving the last element to the position of the removed.
  */
 
-#define g_array_append_val(a,v)	  g_array_append_vals (a, &(v), 1)
-#define g_array_prepend_val(a,v)  g_array_prepend_vals (a, &(v), 1)
-#define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
+#if defined (glib_typeof) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76
+  #define g_array_append_val(a, v)                   \
+    (G_GNUC_EXTENSION ({                             \
+      glib_typeof ((v)) gaa_val_ = (v);              \
+      g_array_append_vals ((a), &gaa_val_, 1);       \
+    }))
+
+  #define g_array_prepend_val(a, v)                  \
+    (G_GNUC_EXTENSION ({                             \
+      glib_typeof ((v)) gap_val_ = (v);              \
+      g_array_prepend_vals ((a), &gap_val_, 1);      \
+    }))
+
+  #define g_array_insert_val(a, i, v)                \
+    (G_GNUC_EXTENSION ({                             \
+      glib_typeof ((v)) gai_val_ = (v);              \
+      g_array_insert_vals ((a), (i), &gai_val_, 1);  \
+    }))
+#else /* !defined (glib_typeof) || GLIB_VERSION_MIN_REQUIRED < GLIB_VERSION_2_76 */
+  #define g_array_append_val(a, v)                   \
+    g_array_append_vals ((a), &((v)), 1)
+
+  #define g_array_prepend_val(a, v)                  \
+    g_array_prepend_vals ((a), &((v)), 1)
+
+  #define g_array_insert_val(a, i, v)                \
+    g_array_insert_vals ((a), (i), &((v)), 1)
+#endif
+
 #define g_array_index(a,t,i)      (((t*) (void *) (a)->data) [(i)])
 
 GLIB_AVAILABLE_IN_ALL