Merge remote-tracking branch 'Blei/gtk-image-loader'

[factor.git] / basis / glib / ffi / ffi.factor

diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index 22b40f47adbecb8377ab0784b2bb8c623cbcb5a8..5eefe08cd0e7288cb421d5faaba34933701e4ac0 100644 (file)
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -1,19 +1,22 @@
-! Copyright (C) 2009 Anton Gorenko.
+! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.destructors
 alien.libraries alien.strings alien.syntax combinators
-gobject-introspection io.encodings.utf8 kernel system
-vocabs.parser words ;
+gobject-introspection gobject-introspection.standard-types
+io.encodings.utf8 kernel system vocabs.parser words ;
 IN: glib.ffi
 
+LIBRARY: glib
+
 <<
 "glib" {
     { [ os winnt? ] [ "libglib-2.0-0.dll" cdecl add-library ] }
     { [ os macosx? ] [ "/opt/local/lib/libglib-2.0.0.dylib" cdecl add-library ] }
-    { [ os unix? ] [ "libglib-2.0.so" cdecl add-library ] }
+    { [ os unix? ] [ drop ] }
 } cond
 >>
 
+
 TYPEDEF: char gchar
 TYPEDEF: uchar guchar
 TYPEDEF: short gshort
@@ -70,6 +73,19 @@ REPLACE-C-TYPE: any gpointer
 
 IMPLEMENT-STRUCTS: GError GPollFD GSource GSourceFuncs ;
 
+CONSTANT: G_MININT8   HEX: -80
+CONSTANT: G_MAXINT8   HEX:  7f
+CONSTANT: G_MAXUINT8  HEX:  ff
+CONSTANT: G_MININT16  HEX: -8000
+CONSTANT: G_MAXINT16  HEX:  7fff
+CONSTANT: G_MAXUINT16 HEX:  ffff
+CONSTANT: G_MININT32  HEX: -80000000
+CONSTANT: G_MAXINT32  HEX:  7fffffff
+CONSTANT: G_MAXUINT32 HEX:  ffffffff
+CONSTANT: G_MININT64  HEX: -8000000000000000
+CONSTANT: G_MAXINT64  HEX:  7fffffffffffffff
+CONSTANT: G_MAXUINT64 HEX:  ffffffffffffffff
+
 GIR: vocab:glib/GLib-2.0.gir
 
 DESTRUCTOR: g_source_unref