diff options
| author | Colin Walters <walters@verbum.org> | 2009-02-17 13:00:58 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-02-17 13:00:58 -0500 |
| commit | ca778d512f3605b2e177012e26d50720c0a110c5 (patch) | |
| tree | 93013fc6e4c5cf61bb927d0eeff1392733e62013 /gir | |
| parent | c163cf24782b41ec118008be2b40684a69b5c969 (diff) | |
| parent | c577448bbdb7711a4e38fea5325e80b4b7dea058 (diff) | |
| download | gobject-introspection-ca778d512f3605b2e177012e26d50720c0a110c5.tar.gz | |
Merge branch 'master' of ssh://walters@git.gnome.org/git/gobject-introspection
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/GL-1.0.gir | 3 | ||||
| -rw-r--r-- | gir/Makefile.am | 2 | ||||
| -rw-r--r-- | gir/gio-2.0.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/gir/GL-1.0.gir b/gir/GL-1.0.gir index e525ecd3..1c27f9e5 100644 --- a/gir/GL-1.0.gir +++ b/gir/GL-1.0.gir @@ -5,11 +5,14 @@ <namespace name="GL" version="1.0"> <record name="bitfield" c:type="GLbitfield"/> <record name="charARB" c:type="GLcharARB"/> + <record name="boolean" c:type="GLboolean"/> <record name="enum" c:type="GLenum"/> <record name="float" c:type="GLfloat"/> <record name="handleARB" c:type="GLhandleARB"/> <record name="int" c:type="GLint"/> + <record name="intptr" c:type="GLintptr"/> <record name="sizei" c:type="GLsizei"/> + <record name="sizeiptr" c:type="GLsizeiptr"/> <record name="uint" c:type="GLuint"/> <record name="void" c:type="GLvoid"/> diff --git a/gir/Makefile.am b/gir/Makefile.am index f74de6d0..9b1b7c64 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -168,7 +168,7 @@ girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(GIRSOURCES) %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) - $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = $(GIRSOURCES:.gir=.typelib) $(GIRSOURCES:.gir=.typelib) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index d7cfb047..1d1974fb 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -574,6 +574,7 @@ /** * g_volume_mount: + * @mount_operation: (allow-none): * @cancellable: (allow-none): */ |