[seed] Fix build with latest GI, where machine-dependent type tags were removed.
- From: Tim Horton <hortont src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seed] Fix build with latest GI, where machine-dependent type tags were removed.
- Date: Mon, 12 Jul 2010 06:08:45 +0000 (UTC)
commit 689e8018c87c65c77a1e5e96acb30dab91bd05e5
Author: Tim Horton <hortont gnome org>
Date: Sun Jul 11 17:38:19 2010 -0700
Fix build with latest GI, where machine-dependent type tags were removed.
libseed/seed-closure.c | 36 ------------------------------------
libseed/seed-types.c | 37 +------------------------------------
2 files changed, 1 insertions(+), 72 deletions(-)
---
diff --git a/libseed/seed-closure.c b/libseed/seed-closure.c
index 36328bb..1ce4b6f 100644
--- a/libseed/seed-closure.c
+++ b/libseed/seed-closure.c
@@ -97,30 +97,12 @@ seed_handle_closure (ffi_cif * cif, void *result, void **args, void *userdata)
case GI_TYPE_TAG_UINT32:
arg->v_uint32 = *(guint32 *) args[i];
break;
- case GI_TYPE_TAG_LONG:
- arg->v_long = *(glong *) args[i];
- break;
case GI_TYPE_TAG_INT64:
arg->v_int64 = *(gint64 *) args[i];
break;
- case GI_TYPE_TAG_ULONG:
- arg->v_ulong = *(gulong *) args[i];
- break;
case GI_TYPE_TAG_UINT64:
arg->v_uint64 = *(guint64 *) args[i];
break;
- case GI_TYPE_TAG_INT:
- arg->v_int = *(gint *) args[i];
- break;
- case GI_TYPE_TAG_SSIZE:
- arg->v_ssize = *(gssize *) args[i];
- break;
- case GI_TYPE_TAG_SIZE:
- arg->v_size = *(gsize *) args[i];
- break;
- case GI_TYPE_TAG_UINT:
- arg->v_uint = *(guint *) args[i];
- break;
case GI_TYPE_TAG_FLOAT:
arg->v_float = *(gfloat *) args[i];
break;
@@ -215,30 +197,12 @@ seed_handle_closure (ffi_cif * cif, void *result, void **args, void *userdata)
case GI_TYPE_TAG_UINT32:
*(guint32 *) result = return_arg.v_uint32;
break;
- case GI_TYPE_TAG_LONG:
- *(glong *) result = return_arg.v_long;
- break;
case GI_TYPE_TAG_INT64:
*(gint64 *) result = return_arg.v_int64;
break;
- case GI_TYPE_TAG_ULONG:
- *(gulong *) result = return_arg.v_ulong;
- break;
case GI_TYPE_TAG_UINT64:
*(guint64 *) result = return_arg.v_uint64;
break;
- case GI_TYPE_TAG_INT:
- *(gint *) result = return_arg.v_int;
- break;
- case GI_TYPE_TAG_SSIZE:
- *(gssize *) result = return_arg.v_ssize;
- break;
- case GI_TYPE_TAG_SIZE:
- *(gsize *) result = return_arg.v_size;
- break;
- case GI_TYPE_TAG_UINT:
- *(guint *) result = return_arg.v_uint;
- break;
case GI_TYPE_TAG_FLOAT:
*(gfloat *) result = return_arg.v_float;
break;
diff --git a/libseed/seed-types.c b/libseed/seed-types.c
index 67af39e..12ae227 100644
--- a/libseed/seed-types.c
+++ b/libseed/seed-types.c
@@ -389,7 +389,7 @@ seed_gi_make_array (JSContextRef ctx,
*array_p = dblresult;
}
break;
- case GI_TYPE_TAG_INT:
+ case GI_TYPE_TAG_INT32:
{
gint *intresult;
@@ -533,30 +533,12 @@ seed_gi_make_argument (JSContextRef ctx,
case GI_TYPE_TAG_UINT32:
arg->v_uint32 = seed_value_to_uint (ctx, value, exception);
break;
- case GI_TYPE_TAG_LONG:
- arg->v_long = seed_value_to_long (ctx, value, exception);
- break;
case GI_TYPE_TAG_INT64:
arg->v_int64 = seed_value_to_int64 (ctx, value, exception);
break;
- case GI_TYPE_TAG_ULONG:
- arg->v_ulong = seed_value_to_ulong (ctx, value, exception);
- break;
case GI_TYPE_TAG_UINT64:
arg->v_uint64 = seed_value_to_uint64 (ctx, value, exception);
break;
- case GI_TYPE_TAG_INT:
- arg->v_int = seed_value_to_int (ctx, value, exception);
- break;
- case GI_TYPE_TAG_UINT:
- arg->v_uint = seed_value_to_uint (ctx, value, exception);
- break;
- case GI_TYPE_TAG_SIZE:
- arg->v_size = seed_value_to_size (ctx, value, exception);
- break;
- case GI_TYPE_TAG_SSIZE:
- arg->v_ssize = seed_value_to_ssize (ctx, value, exception);
- break;
case GI_TYPE_TAG_FLOAT:
arg->v_float = seed_value_to_float (ctx, value, exception);
break;
@@ -572,9 +554,6 @@ seed_gi_make_argument (JSContextRef ctx,
case GI_TYPE_TAG_GTYPE:
arg->v_int = seed_value_to_int (ctx, value, exception);
break;
- case GI_TYPE_TAG_TIME_T:
- arg->v_long = seed_value_to_time_t (ctx, value, exception);
- break;
case GI_TYPE_TAG_INTERFACE:
{
GIBaseInfo *interface;
@@ -815,22 +794,10 @@ seed_gi_argument_make_js (JSContextRef ctx,
return seed_value_from_int (ctx, arg->v_int32, exception);
case GI_TYPE_TAG_UINT32:
return seed_value_from_uint (ctx, arg->v_uint32, exception);
- case GI_TYPE_TAG_LONG:
- return seed_value_from_long (ctx, arg->v_long, exception);
case GI_TYPE_TAG_INT64:
return seed_value_from_int64 (ctx, arg->v_int64, exception);
- case GI_TYPE_TAG_ULONG:
- return seed_value_from_ulong (ctx, arg->v_ulong, exception);
case GI_TYPE_TAG_UINT64:
return seed_value_from_uint64 (ctx, arg->v_uint64, exception);
- case GI_TYPE_TAG_INT:
- return seed_value_from_int (ctx, arg->v_int32, exception);
- case GI_TYPE_TAG_UINT:
- return seed_value_from_uint (ctx, arg->v_uint32, exception);
- case GI_TYPE_TAG_SSIZE:
- return seed_value_from_ssize (ctx, arg->v_ssize, exception);
- case GI_TYPE_TAG_SIZE:
- return seed_value_from_size (ctx, arg->v_size, exception);
case GI_TYPE_TAG_FLOAT:
return seed_value_from_float (ctx, arg->v_float, exception);
case GI_TYPE_TAG_DOUBLE:
@@ -841,8 +808,6 @@ seed_gi_argument_make_js (JSContextRef ctx,
return seed_value_from_filename (ctx, arg->v_string, exception);
case GI_TYPE_TAG_GTYPE:
return seed_value_from_int (ctx, arg->v_int, exception);
- case GI_TYPE_TAG_TIME_T:
- return seed_value_from_time_t (ctx, arg->v_long, exception);
case GI_TYPE_TAG_ARRAY:
{
GITypeInfo *param_type;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]