shutup CVS

[platform/upstream/glib.git] / gobject / gvaluecollector.h

diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index b34a21a..e937996 100644 (file)
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -1,5 +1,5 @@
 /* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
+ * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,11 +21,9 @@
 #ifndef __G_VALUE_COLLECTOR_H__
 #define __G_VALUE_COLLECTOR_H__
 
+#include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 /* we may want to add aggregate types here some day, if requested
  * by users. the basic C types are covered already, everything
@@ -36,6 +34,7 @@ enum  /*< skip >*/
 {
   G_VALUE_COLLECT_INT          = 'i',
   G_VALUE_COLLECT_LONG         = 'l',
+  G_VALUE_COLLECT_INT64         = 'q',
   G_VALUE_COLLECT_DOUBLE       = 'd',
   G_VALUE_COLLECT_POINTER      = 'p'
 };
@@ -47,6 +46,7 @@ union _GTypeCValue
 {
   gint     v_int;
   glong    v_long;
+  gint64   v_int64;
   gdouble  v_double;
   gpointer v_pointer;
 };
@@ -66,12 +66,16 @@ union _GTypeCValue
 G_STMT_START {                                                                         \
   GValue *_value = (value);                                                            \
   guint _flags = (flags);                                                              \
-  GTypeValueTable *_vtable = g_type_value_table_peek (G_VALUE_TYPE (_value));          \
+  GType _value_type = G_VALUE_TYPE (_value);                                           \
+  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);                    \
   gchar *_collect_format = _vtable->collect_format;                                    \
   GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };               \
   guint _n_values = 0;                                                                 \
                                                                                         \
-  g_value_reset (_value);                                                              \
+  if (_vtable->value_free)                                                             \
+    _vtable->value_free (_value);                                                      \
+  _value->g_type = _value_type;                /* value_meminit() from gvalue.c */             \
+  memset (_value->data, 0, sizeof (_value->data));                                     \
   while (*_collect_format)                                                             \
     {                                                                                  \
       GTypeCValue *_cvalue = _cvalues + _n_values++;                                   \
@@ -84,6 +88,9 @@ G_STMT_START {                                                                                \
        case G_VALUE_COLLECT_LONG:                                                      \
          _cvalue->v_long = va_arg ((var_args), glong);                                 \
          break;                                                                        \
+       case G_VALUE_COLLECT_INT64:                                                     \
+         _cvalue->v_int64 = va_arg ((var_args), gint64);                               \
+         break;                                                                        \
        case G_VALUE_COLLECT_DOUBLE:                                                    \
          _cvalue->v_double = va_arg ((var_args), gdouble);                             \
          break;                                                                        \
@@ -106,9 +113,10 @@ G_STMT_START {                                                                             \
  */
 #define G_VALUE_LCOPY(value, var_args, flags, __error)                                 \
 G_STMT_START {                                                                         \
-  GValue *_value = (value);                                                            \
+  const GValue *_value = (value);                                                      \
   guint _flags = (flags);                                                              \
-  GTypeValueTable *_vtable = g_type_value_table_peek (G_VALUE_TYPE (_value));          \
+  GType _value_type = G_VALUE_TYPE (_value);                                           \
+  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);                    \
   gchar *_lcopy_format = _vtable->lcopy_format;                                                \
   GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };               \
   guint _n_values = 0;                                                                 \
@@ -125,6 +133,9 @@ G_STMT_START {                                                                              \
        case G_VALUE_COLLECT_LONG:                                                      \
          _cvalue->v_long = va_arg ((var_args), glong);                                 \
          break;                                                                        \
+       case G_VALUE_COLLECT_INT64:                                                     \
+         _cvalue->v_int64 = va_arg ((var_args), gint64);                               \
+         break;                                                                        \
        case G_VALUE_COLLECT_DOUBLE:                                                    \
          _cvalue->v_double = va_arg ((var_args), gdouble);                             \
          break;                                                                        \
@@ -144,10 +155,6 @@ G_STMT_START {                                                                             \
 
 #define        G_VALUE_COLLECT_FORMAT_MAX_LENGTH       (8)
 
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __G_VALUE_COLLECTOR_H__ */