]> gitweb.factorcode.org Git - factor.git/commitdiff
projects / factor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 926d154 fde0321)
Merge branch 'gtk' into gtk-image-loader
authorPhilipp Brüschweiler <blei42@gmail.com>
Mon, 26 Jul 2010 17:29:17 +0000 (19:29 +0200)
committerPhilipp Brüschweiler <blei42@gmail.com>
Mon, 26 Jul 2010 17:29:17 +0000 (19:29 +0200)
1  2 
basis/glib/ffi/ffi.factor patch | diff1 | diff2 | blob | history
basis/ui/backend/gtk/gtk.factor patch | diff1 | diff2 | blob | history

diff --cc basis/glib/ffi/ffi.factor
index f5af540dfaf9a9f997453beb7d54dc20e6c6d0be,f810348aa0685cc734e2b67a7c19bda4e1cb6f27..22b40f47adbecb8377ab0784b2bb8c623cbcb5a8
--- 1/basis/glib/ffi/ffi.factor
--- 2/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@@ -66,9 -63,11 +64,11 @@@ TYPEDEF: guint32 gunicha
  TYPEDEF: guint16 gunichar2
  
  TYPEDEF: gpointer pointer
- TYPEDEF: gpointer any
+ 
+ REPLACE-C-TYPE: long\sdouble double
+ REPLACE-C-TYPE: any gpointer
  
 -IMPLEMENT-STRUCTS: GPollFD GSource GSourceFuncs ;
 +IMPLEMENT-STRUCTS: GError GPollFD GSource GSourceFuncs ;
  
  GIR: vocab:glib/GLib-2.0.gir
  
diff --cc basis/ui/backend/gtk/gtk.factor
Simple merge
Factor programming language