luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 13:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug552566-timet/wip'

Browse Source 
svn path=/trunk/; revision=624
This commit is contained in:
Colin Walters 2008-09-23 18:20:25 +00:00
parent bfb6271201
commit 8fc943f941
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ginfo.c
View File

@ -1720,6 +1720,9 @@ g_constant_info_get_value (GIConstantInfo *info,
case GI_TYPE_TAG_DOUBLE: case GI_TYPE_TAG_DOUBLE:
value->v_double = *(gdouble*)&base->typelib->data[blob->offset]; value->v_double = *(gdouble*)&base->typelib->data[blob->offset];
break; break;
case GI_TYPE_TAG_TIME_T:
value->v_long = *(long*)&base->typelib->data[blob->offset];
break;
case GI_TYPE_TAG_INT: case GI_TYPE_TAG_INT:
value->v_int = *(gint*)&base->typelib->data[blob->offset]; value->v_int = *(gint*)&base->typelib->data[blob->offset];
break; break;

1
ginvoke.c
View File

@ -89,6 +89,7 @@ get_ffi_type (GITypeInfo *info)
rettype = &ffi_type_slong; rettype = &ffi_type_slong;
break; break;
case GI_TYPE_TAG_SIZE: /* FIXME */ case GI_TYPE_TAG_SIZE: /* FIXME */
case GI_TYPE_TAG_TIME_T: /* May not be portable */
case GI_TYPE_TAG_ULONG: case GI_TYPE_TAG_ULONG:
rettype = &ffi_type_ulong; rettype = &ffi_type_ulong;
break; break;

2
girepository.c
View File

@ -748,6 +748,8 @@ g_type_tag_to_string (GITypeTag type)
return "float"; return "float";
case GI_TYPE_TAG_DOUBLE: case GI_TYPE_TAG_DOUBLE:
return "double"; return "double";
case GI_TYPE_TAG_TIME_T:
return "time_t";
case GI_TYPE_TAG_UTF8: case GI_TYPE_TAG_UTF8:
return "utf8"; return "utf8";
case GI_TYPE_TAG_FILENAME: case GI_TYPE_TAG_FILENAME:

17
girepository.h
View File

@ -285,14 +285,15 @@ typedef enum {
GI_TYPE_TAG_SIZE = 15, GI_TYPE_TAG_SIZE = 15,
GI_TYPE_TAG_FLOAT = 16, GI_TYPE_TAG_FLOAT = 16,
GI_TYPE_TAG_DOUBLE = 17, GI_TYPE_TAG_DOUBLE = 17,
GI_TYPE_TAG_UTF8 = 18, GI_TYPE_TAG_TIME_T = 18,
GI_TYPE_TAG_FILENAME = 19, GI_TYPE_TAG_UTF8 = 19,
GI_TYPE_TAG_ARRAY = 20, GI_TYPE_TAG_FILENAME = 20,
GI_TYPE_TAG_INTERFACE = 21, GI_TYPE_TAG_ARRAY = 21,
GI_TYPE_TAG_GLIST = 22, GI_TYPE_TAG_INTERFACE = 22,
GI_TYPE_TAG_GSLIST = 23, GI_TYPE_TAG_GLIST = 23,
GI_TYPE_TAG_GHASH = 24, GI_TYPE_TAG_GSLIST = 24,
GI_TYPE_TAG_ERROR = 25 GI_TYPE_TAG_GHASH = 25,
GI_TYPE_TAG_ERROR = 26
} GITypeTag; } GITypeTag;
const gchar* g_type_tag_to_string (GITypeTag type); const gchar* g_type_tag_to_string (GITypeTag type);

1
girnode.c
View File

@ -2117,6 +2117,7 @@ g_ir_node_build_typelib (GIrNode *node,
*(glong*)&data[blob->offset] = (glong) parse_int_value (constant->value); *(glong*)&data[blob->offset] = (glong) parse_int_value (constant->value);
break; break;
case GI_TYPE_TAG_SIZE: /* FIXME */ case GI_TYPE_TAG_SIZE: /* FIXME */
case GI_TYPE_TAG_TIME_T:
case GI_TYPE_TAG_ULONG: case GI_TYPE_TAG_ULONG:
blob->size = sizeof (gulong); blob->size = sizeof (gulong);
*(gulong*)&data[blob->offset] = (gulong) parse_uint_value (constant->value); *(gulong*)&data[blob->offset] = (gulong) parse_uint_value (constant->value);

1
girparser.c
View File

@ -252,6 +252,7 @@ static BasicTypeInfo basic_types[] = {
{ "size", GI_TYPE_TAG_SIZE, 0 }, { "size", GI_TYPE_TAG_SIZE, 0 },
{ "float", GI_TYPE_TAG_FLOAT, 0 }, { "float", GI_TYPE_TAG_FLOAT, 0 },
{ "double", GI_TYPE_TAG_DOUBLE, 0 }, { "double", GI_TYPE_TAG_DOUBLE, 0 },
{ "time_t", GI_TYPE_TAG_TIME_T, 0 },
{ "utf8", GI_TYPE_TAG_UTF8, 1 }, { "utf8", GI_TYPE_TAG_UTF8, 1 },
{ "filename", GI_TYPE_TAG_FILENAME,1 }, { "filename", GI_TYPE_TAG_FILENAME,1 },