summaryrefslogtreecommitdiff
path: root/girepository/girepository.h
diff options
context:
space:
mode:
authorMark Lee <marklee@src.gnome.org>2009-06-19 16:53:03 -0700
committerColin Walters <walters@verbum.org>2009-06-22 14:01:56 -0400
commit7048d711b2787af81767bb472f5dbaf0f97d6db9 (patch)
tree1f5635988ec08dd7020c947e02f58cb32def5c90 /girepository/girepository.h
parent94bae77228d816a308c054357125713b746b687c (diff)
downloadgobject-introspection-7048d711b2787af81767bb472f5dbaf0f97d6db9.tar.gz
Bug 584423 – Add short/ushort support
Add type tags for short and ushort, plus all of the requisite code needed to utilize them in libgirepository. Add support in the scanner's AST files. Add test functions to the everything library and the expected gir file. gtypelib.c constant validation fixed by Colin Walters <walters@verbum.org>
Diffstat (limited to 'girepository/girepository.h')
-rw-r--r--girepository/girepository.h40
1 files changed, 22 insertions, 18 deletions
diff --git a/girepository/girepository.h b/girepository/girepository.h
index a01c3ec3..559be1ee 100644
--- a/girepository/girepository.h
+++ b/girepository/girepository.h
@@ -240,6 +240,8 @@ typedef union
guint64 v_uint64;
gfloat v_float;
gdouble v_double;
+ gshort v_short;
+ gushort v_ushort;
gint v_int;
guint v_uint;
glong v_long;
@@ -329,25 +331,27 @@ typedef enum {
GI_TYPE_TAG_UINT32 = 7,
GI_TYPE_TAG_INT64 = 8,
GI_TYPE_TAG_UINT64 = 9,
- GI_TYPE_TAG_INT = 10,
- GI_TYPE_TAG_UINT = 11,
- GI_TYPE_TAG_LONG = 12,
- GI_TYPE_TAG_ULONG = 13,
- GI_TYPE_TAG_SSIZE = 14,
- GI_TYPE_TAG_SIZE = 15,
- GI_TYPE_TAG_FLOAT = 16,
- GI_TYPE_TAG_DOUBLE = 17,
- GI_TYPE_TAG_TIME_T = 18,
- GI_TYPE_TAG_GTYPE = 19,
- GI_TYPE_TAG_UTF8 = 20,
- GI_TYPE_TAG_FILENAME = 21,
+ GI_TYPE_TAG_SHORT = 10,
+ GI_TYPE_TAG_USHORT = 11,
+ GI_TYPE_TAG_INT = 12,
+ GI_TYPE_TAG_UINT = 13,
+ GI_TYPE_TAG_LONG = 14,
+ GI_TYPE_TAG_ULONG = 15,
+ GI_TYPE_TAG_SSIZE = 16,
+ GI_TYPE_TAG_SIZE = 17,
+ GI_TYPE_TAG_FLOAT = 18,
+ GI_TYPE_TAG_DOUBLE = 19,
+ GI_TYPE_TAG_TIME_T = 20,
+ GI_TYPE_TAG_GTYPE = 21,
+ GI_TYPE_TAG_UTF8 = 22,
+ GI_TYPE_TAG_FILENAME = 23,
/* Non-basic types */
- GI_TYPE_TAG_ARRAY = 22,
- GI_TYPE_TAG_INTERFACE = 23,
- GI_TYPE_TAG_GLIST = 24,
- GI_TYPE_TAG_GSLIST = 25,
- GI_TYPE_TAG_GHASH = 26,
- GI_TYPE_TAG_ERROR = 27
+ GI_TYPE_TAG_ARRAY = 24,
+ GI_TYPE_TAG_INTERFACE = 25,
+ GI_TYPE_TAG_GLIST = 26,
+ GI_TYPE_TAG_GSLIST = 27,
+ GI_TYPE_TAG_GHASH = 28,
+ GI_TYPE_TAG_ERROR = 29
/* Note - there is only room currently for 32 tags.
* See docs/typelib-format.txt SimpleTypeBlob definition */
} GITypeTag;