[Gd-chatter] r11702 - in trunk/fundev/sources: gtk/gtk-c-ffi gtk/gtk-glue lib/run-time network network/unix-sockets registry/x86-freebsd registry/x86-linux

hannes at gwydiondylan.org hannes at gwydiondylan.org
Sun Feb 24 08:38:15 CET 2008


Author: hannes
Date: Sun Feb 24 08:38:13 2008
New Revision: 11702

Added:
   trunk/fundev/sources/gtk/gtk-c-ffi/gtk-c-ffi-freebsd.hdp   (contents, props changed)
   trunk/fundev/sources/gtk/gtk-c-ffi/gtk-c-ffi-linux.hdp
      - copied unchanged from r11701, trunk/fundev/sources/gtk/gtk-c-ffi/gtk-c-ffi-unix.hdp
   trunk/fundev/sources/registry/x86-freebsd/duim   (contents, props changed)
   trunk/fundev/sources/registry/x86-freebsd/gtk   (contents, props changed)
   trunk/fundev/sources/registry/x86-freebsd/gtk-c-ffi   (contents, props changed)
Removed:
   trunk/fundev/sources/gtk/gtk-c-ffi/gtk-c-ffi-unix.hdp
Modified:
   trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-12-linux.dylan
   trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-8-linux.intr
   trunk/fundev/sources/gtk/gtk-c-ffi/gtk-module-2-12-linux.dylan
   trunk/fundev/sources/gtk/gtk-glue/gtk.dylan
   trunk/fundev/sources/gtk/gtk-glue/module.dylan
   trunk/fundev/sources/lib/run-time/linux-types.h
   trunk/fundev/sources/network/unix-network-library.dylan
   trunk/fundev/sources/network/unix-sockets/sockets-extras.dylan
   trunk/fundev/sources/registry/x86-linux/gtk-c-ffi
Log:
Job: fd
* support for GTK on FreeBSD:
 -> treat <GType> as a <machine-word> (because it uses more than 29 bits)
 -> define constants for G-TYPE-* in gtk.dylan, remove from gtk-c-ffi
 -> remove several unused bindings from gtk-c-ffi, 
      which are undefined on FreeBSD
 -> registry entries for gtk, duim, gtk-c-ffi for FreeBSD

* export <C-buffer-offset>, <LPSOCKADDR> and <timeval> from network library
  (these are also exported on Windows, no reason why they should not be
   exported on UNIX, too (needed in network-interfaces))


Modified: trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-12-linux.dylan
==============================================================================
--- trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-12-linux.dylan	(original)
+++ trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-12-linux.dylan	Sun Feb 24 08:38:13 2008
@@ -9,7 +9,8 @@
 
 define constant <gsize> = <C-unsigned-int>;
 
-define constant <GType> = <gsize>;
+//define constant <GType> = <gsize>;
+define constant <GType> = <C-raw-unsigned-long>;
 
 define C-struct <_GTypeClass>
   slot GTypeClass-g-type :: <C-unsigned-int>;
@@ -4075,48 +4076,6 @@
  /* Ignoring declaration for {instance of <variable-declaration>} "_g-type-debug-flags"*/
 define constant $G-TYPE-FUNDAMENTAL-MAX = 1020;
 
-define constant $G-TYPE-INVALID = 0;
-
-define constant $G-TYPE-NONE = 4;
-
-define constant $G-TYPE-INTERFACE = 8;
-
-define constant $G-TYPE-CHAR = 12;
-
-define constant $G-TYPE-UCHAR = 16;
-
-define constant $G-TYPE-BOOLEAN = 20;
-
-define constant $G-TYPE-INT = 24;
-
-define constant $G-TYPE-UINT = 28;
-
-define constant $G-TYPE-LONG = 32;
-
-define constant $G-TYPE-ULONG = 36;
-
-define constant $G-TYPE-INT64 = 40;
-
-define constant $G-TYPE-UINT64 = 44;
-
-define constant $G-TYPE-ENUM = 48;
-
-define constant $G-TYPE-FLAGS = 52;
-
-define constant $G-TYPE-FLOAT = 56;
-
-define constant $G-TYPE-DOUBLE = 60;
-
-define constant $G-TYPE-STRING = 64;
-
-define constant $G-TYPE-POINTER = 68;
-
-define constant $G-TYPE-BOXED = 72;
-
-define constant $G-TYPE-PARAM = 76;
-
-define constant $G-TYPE-OBJECT = 80;
-
 define constant $G-TYPE-FUNDAMENTAL-SHIFT = 2;
 
 define constant $G-TYPE-RESERVED-GLIB-FIRST = 21;
@@ -12158,11 +12117,6 @@
 
  /* Ignoring declaration for {instance of <variable-declaration>} "daylight"*/
  /* Ignoring declaration for {instance of <variable-declaration>} "timezone"*/
-define C-function stime
-  input parameter arg1 :: <time-t*>;
-  result res :: <C-signed-int>;
-  c-name: "stime";
-end;
 
 define C-function timegm
   input parameter arg1 :: <tm>;
@@ -12176,12 +12130,6 @@
   c-name: "timelocal";
 end;
 
-define C-function dysize
-  input parameter arg1 :: <C-signed-int>;
-  result res :: <C-signed-int>;
-  c-name: "dysize";
-end;
-
 define C-function nanosleep
   input parameter arg1 :: <timespec>;
   input parameter arg2 :: <timespec>;
@@ -12189,23 +12137,6 @@
   c-name: "nanosleep";
 end;
 
-define C-function clock-nanosleep
-  input parameter arg1 :: <clockid-t>;
-  input parameter arg2 :: <C-signed-int>;
-  input parameter arg3 :: <timespec>;
-  input parameter arg4 :: <timespec>;
-  result res :: <C-signed-int>;
-  c-name: "clock_nanosleep";
-end;
-
-define C-pointer-type <clockid-t*> => <clockid-t>;
-define C-function clock-getcpuclockid
-  input parameter arg1 :: <pid-t>;
-  input parameter arg2 :: <clockid-t*>;
-  result res :: <C-signed-int>;
-  c-name: "clock_getcpuclockid";
-end;
-
 define C-pointer-type <timer-t*> => <timer-t>;
 define C-function timer-create
   input parameter arg1 :: <clockid-t>;
@@ -12249,8 +12180,6 @@
 
 define constant $__time-t-defined = 1;
 
-define constant $__clockid-t-defined = 1;
-
 define constant $__timer-t-defined = 1;
 
 define constant $__timespec-defined = 1;
@@ -17787,11 +17716,6 @@
  /* Ignoring declaration for {instance of <variable-declaration>} "stdin"*/
  /* Ignoring declaration for {instance of <variable-declaration>} "stdout"*/
  /* Ignoring declaration for {instance of <variable-declaration>} "stderr"*/
-define C-function remove
-  input parameter arg1 :: <char*>;
-  result res :: <C-signed-int>;
-  c-name: "remove";
-end;
 
 define C-function rename
   input parameter arg1 :: <char*>;
@@ -17811,12 +17735,6 @@
   c-name: "tmpnam";
 end;
 
-define C-function tmpnam-r
-  input parameter arg1 :: <char*>;
-  result res :: <char*>;
-  c-name: "tmpnam_r";
-end;
-
 define C-function tempnam
   input parameter arg1 :: <char*>;
   input parameter arg2 :: <char*>;
@@ -17836,12 +17754,6 @@
   c-name: "fflush";
 end;
 
-define C-function fflush-unlocked
-  input parameter arg1 :: <FILE>;
-  result res :: <C-signed-int>;
-  c-name: "fflush_unlocked";
-end;
-
 define C-function fopen
   input parameter arg1 :: <char*>;
   input parameter arg2 :: <char*>;
@@ -17999,12 +17911,6 @@
   c-name: "getchar_unlocked";
 end;
 
-define C-function fgetc-unlocked
-  input parameter arg1 :: <FILE>;
-  result res :: <C-signed-int>;
-  c-name: "fgetc_unlocked";
-end;
-
 define C-function fputc
   input parameter arg1 :: <C-signed-int>;
   input parameter arg2 :: <FILE>;
@@ -18025,13 +17931,6 @@
   c-name: "putchar";
 end;
 
-define C-function fputc-unlocked
-  input parameter arg1 :: <C-signed-int>;
-  input parameter arg2 :: <FILE>;
-  result res :: <C-signed-int>;
-  c-name: "fputc_unlocked";
-end;
-
 define C-function putc-unlocked
   input parameter arg1 :: <C-signed-int>;
   input parameter arg2 :: <FILE>;
@@ -18110,24 +18009,6 @@
   c-name: "fwrite";
 end;
 
-define C-function fread-unlocked
-  input parameter arg1 :: <C-void*>;
-  input parameter arg2 :: <size-t>;
-  input parameter arg3 :: <size-t>;
-  input parameter arg4 :: <FILE>;
-  result res :: <size-t>;
-  c-name: "fread_unlocked";
-end;
-
-define C-function fwrite-unlocked
-  input parameter arg1 :: <C-void*>;
-  input parameter arg2 :: <size-t>;
-  input parameter arg3 :: <size-t>;
-  input parameter arg4 :: <FILE>;
-  result res :: <size-t>;
-  c-name: "fwrite_unlocked";
-end;
-
 define C-function fseek
   input parameter arg1 :: <FILE>;
   input parameter arg2 :: <C-signed-long>;
@@ -18298,196 +18179,6 @@
 
 define constant $FOPEN-MAX = 16;
 
-define C-struct <_IO-jump-t>
-end;
-
-define constant <__codecvt-result> = <C-int>;
-define constant $__codecvt-ok = 0;
-define constant $__codecvt-partial = 1;
-define constant $__codecvt-error = 2;
-define constant $__codecvt-noconv = 3;
-
-define C-struct <_IO-FILE-plus>
-end;
-
- /* Ignoring declaration for {instance of <variable-declaration>} "_IO-2-1-stdin-"*/
- /* Ignoring declaration for {instance of <variable-declaration>} "_IO-2-1-stdout-"*/
- /* Ignoring declaration for {instance of <variable-declaration>} "_IO-2-1-stderr-"*/
-define constant <anonymous-2307> = <C-function-pointer>;
-define constant <__io-read-fn> = <anonymous-2307>;
-
-define constant <anonymous-2308> = <C-function-pointer>;
-define constant <__io-write-fn> = <anonymous-2308>;
-
-define constant <anonymous-2309> = <C-function-pointer>;
-define constant <__io-seek-fn> = <anonymous-2309>;
-
-define constant <anonymous-2310> = <C-function-pointer>;
-define constant <__io-close-fn> = <anonymous-2310>;
-
-define C-function __underflow
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "__underflow";
-end;
-
-define C-function __uflow
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "__uflow";
-end;
-
-define C-function __overflow
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <C-signed-int>;
-  result res :: <C-signed-int>;
-  c-name: "__overflow";
-end;
-
-define C-function __wunderflow
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <wint-t>;
-  c-name: "__wunderflow";
-end;
-
-define C-function __wuflow
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <wint-t>;
-  c-name: "__wuflow";
-end;
-
-define C-function __woverflow
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <wint-t>;
-  result res :: <wint-t>;
-  c-name: "__woverflow";
-end;
-
-define C-function _IO-getc
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_getc";
-end;
-
-define C-function _IO-putc
-  input parameter arg1 :: <C-signed-int>;
-  input parameter arg2 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_putc";
-end;
-
-define C-function _IO-feof
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_feof";
-end;
-
-define C-function _IO-ferror
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_ferror";
-end;
-
-define C-function _IO-peekc-locked
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_peekc_locked";
-end;
-
-define C-function _IO-flockfile
-  input parameter arg1 :: <_IO-FILE>;
-  c-name: "_IO_flockfile";
-end;
-
-define C-function _IO-funlockfile
-  input parameter arg1 :: <_IO-FILE>;
-  c-name: "_IO_funlockfile";
-end;
-
-define C-function _IO-ftrylockfile
-  input parameter arg1 :: <_IO-FILE>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_ftrylockfile";
-end;
-
-define C-function _IO-vfscanf
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <char*>;
-  input parameter arg3 :: <__gnuc-va-list>;
-  input parameter arg4 :: <int*>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_vfscanf";
-end;
-
-define C-function _IO-vfprintf
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <char*>;
-  input parameter arg3 :: <__gnuc-va-list>;
-  result res :: <C-signed-int>;
-  c-name: "_IO_vfprintf";
-end;
-
-define C-function _IO-padn
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <C-signed-int>;
-  input parameter arg3 :: <__ssize-t>;
-  result res :: <__ssize-t>;
-  c-name: "_IO_padn";
-end;
-
-define C-function _IO-sgetn
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <C-void*>;
-  input parameter arg3 :: <size-t>;
-  result res :: <size-t>;
-  c-name: "_IO_sgetn";
-end;
-
-define C-function _IO-seekoff
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <__off64-t>;
-  input parameter arg3 :: <C-signed-int>;
-  input parameter arg4 :: <C-signed-int>;
-  result res :: <__off64-t>;
-  c-name: "_IO_seekoff";
-end;
-
-define C-function _IO-seekpos
-  input parameter arg1 :: <_IO-FILE>;
-  input parameter arg2 :: <__off64-t>;
-  input parameter arg3 :: <C-signed-int>;
-  result res :: <__off64-t>;
-  c-name: "_IO_seekpos";
-end;
-
-define C-function _IO-free-backup-area
-  input parameter arg1 :: <_IO-FILE>;
-  c-name: "_IO_free_backup_area";
-end;
-
-define constant <_IO-pos-t> = <_G-fpos-t>;
-
-define constant <_IO-fpos-t> = <_G-fpos-t>;
-
-define C-struct <_G-fpos64-t>
-  slot G_fpos64_t-__pos :: <__quad-t>;
-  slot G_fpos64_t-__state :: <__mbstate-t>;
-end;
-
-define constant <_IO-fpos64-t> = <_G-fpos64-t>;
-
-define constant <_IO-size-t> = <size-t>;
-
-define constant <_IO-ssize-t> = <__ssize-t>;
-
-define constant <_IO-off-t> = <__off-t>;
-
-define constant <_IO-off64-t> = <__off64-t>;
-
-define constant <_IO-pid-t> = <__pid-t>;
-
-define constant <_IO-uid-t> = <__uid-t>;
-
 define C-struct <__gconv-loaded-object>
 end;
 

Modified: trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-8-linux.intr
==============================================================================
--- trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-8-linux.intr	(original)
+++ trunk/fundev/sources/gtk/gtk-c-ffi/gtk-2-8-linux.intr	Sun Feb 24 08:38:13 2008
@@ -4,6 +4,59 @@
   #include "gtk/gtk.h",
     import: all-recursive,
     exclude: {
+      "G_TYPE_INVALID",
+      "G_TYPE_NONE",
+      "G_TYPE_CHAR",
+      "G_TYPE_UCHAR",
+      "G_TYPE_BOOLEAN",
+      "G_TYPE_INT",
+      "G_TYPE_UINT",
+      "G_TYPE_LONG",
+      "G_TYPE_ULONG",
+      "G_TYPE_INT64",
+      "G_TYPE_UINT64",
+      "G_TYPE_ENUM",
+      "G_TYPE_FLAGS",
+      "G_TYPE_FLOAT",
+      "G_TYPE_DOUBLE",
+      "G_TYPE_STRING",
+      "G_TYPE_POINTER",
+      "G_TYPE_BOXED",
+      "G_TYPE_PARAM",
+      "G_TYPE_OBJECT",
+      "G_TYPE_INTERFACE",
+      "_IO_ferror",
+      "remove",
+      "_IO_sgetn",
+      "__woverflow",
+      "_IO_funlockfile",
+      "__overflow",
+      "_IO_flockfile",
+      "tmpnam_r",
+      "_IO_padn",
+      "_IO_ftrylockfile",
+      "clock_getcpuclockid",
+      "_IO_getc",
+      "_IO_free_backup_area",
+      "__underflow",
+      "__wunderflow",
+      "__uflow",
+      "fread_unlocked",
+      "_IO_peekc_locked",
+      "_IO_feof",
+      "fflush_unlocked",
+      "fwrite_unlocked",
+      "dysize",
+      "_IO_vfscanf",
+      "__wuflow",
+      "fgetc_unlocked",
+      "stime",
+      "_IO_vfprintf",
+      "_IO_seekoff",
+      "_IO_putc",
+      "_IO_seekpos",
+      "fputc_unlocked",
+      "clock_nanosleep",
       "g_scanner_cur_value", // returns a union of size 8
       "glib_dummy_decl",
       "_g_utf8_make_valid",

Added: trunk/fundev/sources/gtk/gtk-c-ffi/gtk-c-ffi-freebsd.hdp
==============================================================================
--- (empty file)
+++ trunk/fundev/sources/gtk/gtk-c-ffi/gtk-c-ffi-freebsd.hdp	Sun Feb 24 08:38:13 2008
@@ -0,0 +1,15 @@
+comment:	This file is generated, please don't edit
+format-version:	2
+library:	gtk-c-ffi
+files:	library
+	gtk-module-2-12-linux
+	gtk-2-12-linux
+c-libraries: -L/usr/local/lib -lgthread-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lcairo -lpangoft2-1.0 -lfontconfig -lfreetype -lz -lpango-1.0 -lm -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -liconv -lrt
+base-address:	0x63FE0000
+linker-options:	$(guilflags)
+major-version:	1
+minor-version:	0
+library-pack:	0
+compilation-mode:	tight
+target-type:	dll
+comment:	additional keywords

Modified: trunk/fundev/sources/gtk/gtk-c-ffi/gtk-module-2-12-linux.dylan
==============================================================================
--- trunk/fundev/sources/gtk/gtk-c-ffi/gtk-module-2-12-linux.dylan	(original)
+++ trunk/fundev/sources/gtk/gtk-c-ffi/gtk-module-2-12-linux.dylan	Sun Feb 24 08:38:13 2008
@@ -344,7 +344,6 @@
     $CLOCK-THREAD-CPUTIME-ID,
     $CLOCKS-PER-SEC,
     $COLL-WEIGHTS-MAX,
-    $DELAYTIMER-MAX,
     $EOF,
     $EXPR-NEST-MAX,
     $FALSE,
@@ -569,28 +568,16 @@
     $G-MARKUP-ERROR-UNKNOWN-ATTRIBUTE,
     $G-MARKUP-ERROR-UNKNOWN-ELEMENT,
     $G-MARKUP-TREAT-CDATA-AS-TEXT,
-    $G-MAXINT,
-    $G-MAXINT64,
-    $G-MAXLONG,
     $G-MAXSHORT,
-    $G-MAXSIZE,
-    $G-MAXSSIZE,
-    $G-MAXUINT,
     $G-MAXUINT16,
-    $G-MAXUINT32,
     $G-MAXUINT8,
-    $G-MAXULONG,
     $G-MAXUSHORT,
     $G-MEM-ALIGN,
-    $G-MININT,
-    $G-MINLONG,
     $G-MINSHORT,
-    $G-MINSSIZE,
     $G-MODULE-BIND-LAZY,
     $G-MODULE-BIND-LOCAL,
     $G-MODULE-BIND-MASK,
     $G-MODULE-SUFFIX,
-    $G-MUTEX-DEBUG-MAGIC,
     $G-NORMALIZE-ALL,
     $G-NORMALIZE-ALL-COMPOSE,
     $G-NORMALIZE-DEFAULT,
@@ -763,15 +750,10 @@
     $G-TRAVERSE-MASK,
     $G-TRAVERSE-NON-LEAFS,
     $G-TRAVERSE-NON-LEAVES,
-    $G-TYPE-BOOLEAN,
-    $G-TYPE-BOXED,
-    $G-TYPE-CHAR,
     $G-TYPE-DEBUG-MASK,
     $G-TYPE-DEBUG-NONE,
     $G-TYPE-DEBUG-OBJECTS,
     $G-TYPE-DEBUG-SIGNALS,
-    $G-TYPE-DOUBLE,
-    $G-TYPE-ENUM,
     $G-TYPE-FLAG-ABSTRACT,
     $G-TYPE-FLAG-CLASSED,
     $G-TYPE-FLAG-DEEP-DERIVABLE,
@@ -779,29 +761,13 @@
     $G-TYPE-FLAG-INSTANTIATABLE,
     $G-TYPE-FLAG-RESERVED-ID-BIT,
     $G-TYPE-FLAG-VALUE-ABSTRACT,
-    $G-TYPE-FLAGS,
-    $G-TYPE-FLOAT,
     $G-TYPE-FUNDAMENTAL-MAX,
     $G-TYPE-FUNDAMENTAL-SHIFT,
-    $G-TYPE-INT,
-    $G-TYPE-INT64,
-    $G-TYPE-INTERFACE,
-    $G-TYPE-INVALID,
-    $G-TYPE-LONG,
-    $G-TYPE-NONE,
-    $G-TYPE-OBJECT,
-    $G-TYPE-PARAM,
-    $G-TYPE-POINTER,
     $G-TYPE-RESERVED-BSE-FIRST,
     $G-TYPE-RESERVED-BSE-LAST,
     $G-TYPE-RESERVED-GLIB-FIRST,
     $G-TYPE-RESERVED-GLIB-LAST,
     $G-TYPE-RESERVED-USER-FIRST,
-    $G-TYPE-STRING,
-    $G-TYPE-UCHAR,
-    $G-TYPE-UINT,
-    $G-TYPE-UINT64,
-    $G-TYPE-ULONG,
     $G-UNICODE-BREAK-AFTER,
     $G-UNICODE-BREAK-ALPHABETIC,
     $G-UNICODE-BREAK-AMBIGUOUS,
@@ -2090,15 +2056,11 @@
     $GTK-WRAP-WORD,
     $GTK-WRAP-WORD-CHAR,
     $HOST-NAME-MAX,
-    $INT-MAX,
-    $INT-MIN,
     $L-ctermid,
     $L-cuserid,
     $L-tmpnam,
     $LINE-MAX,
     $LOGIN-NAME-MAX,
-    $LONG-MAX,
-    $LONG-MIN,
     $MAX-CANON,
     $MAX-INPUT,
     $MB-LEN-MAX,
@@ -2283,17 +2245,13 @@
     $SEEK-CUR,
     $SEEK-END,
     $SEEK-SET,
-    $SEM-VALUE-MAX,
     $SHRT-MAX,
     $SHRT-MIN,
-    $SSIZE-MAX,
     $TIMER-ABSTIME,
     $TMP-MAX,
     $TRUE,
     $TTY-NAME-MAX,
     $UCHAR-MAX,
-    $UINT-MAX,
-    $ULONG-MAX,
     $USHRT-MAX,
     $XATTR-LIST-MAX,
     $XATTR-NAME-MAX,
@@ -2350,8 +2308,6 @@
     $_IO-LEFT,
     $_IO-LINE-BUF,
     $_IO-LINKED,
-    $_IO-MAGIC,
-    $_IO-MAGIC-MASK,
     $_IO-NO-READS,
     $_IO-NO-WRITES,
     $_IO-OCT,
@@ -2382,7 +2338,6 @@
     $_IOS-TRUNC,
     $_LIBC-LIMITS-H-,
     $_LIMITS-H,
-    $_OLD-STDIO-MAGIC,
     $_POSIX-AIO-LISTIO-MAX,
     $_POSIX-AIO-MAX,
     $_POSIX-ARG-MAX,
@@ -2465,16 +2420,9 @@
     $__USE-POSIX2,
     $__USE-SVID,
     $__USE-XOPEN2K,
-    $__WCHAR-MAX,
-    $__WCHAR-MIN,
     $__WORDSIZE,
     $____FILE-defined,
     $__clock-t-defined,
-    $__clockid-t-defined,
-    $__codecvt-error,
-    $__codecvt-noconv,
-    $__codecvt-ok,
-    $__codecvt-partial,
     $__mbstate-t-defined,
     $__time-t-defined,
     $__timer-t-defined,
@@ -3823,7 +3771,6 @@
     <_AtkValue>,
     <_AtkValueIface>,
     <_G-fpos-t>,
-    <_G-fpos64-t>,
     <_G-iconv-t>,
     <_G-int16-t>,
     <_G-int32-t>,
@@ -4516,22 +4463,11 @@
     <_GtkWindowGeometryInfo>,
     <_GtkWindowGroup>,
     <_GtkWindowGroupClass>,
-    <_IO-FILE-plus>,
     <_IO-FILE>,
-    <_IO-fpos-t>,
-    <_IO-fpos64-t>,
     <_IO-iconv-t>,
-    <_IO-jump-t>,
     <_IO-lock-t*>,
     <_IO-lock-t>,
     <_IO-marker>,
-    <_IO-off-t>,
-    <_IO-off64-t>,
-    <_IO-pid-t>,
-    <_IO-pos-t>,
-    <_IO-size-t>,
-    <_IO-ssize-t>,
-    <_IO-uid-t>,
     <_IO-va-list>,
     <_IO-wint-t>,
     <_PangoAnalysis>,
@@ -4585,7 +4521,6 @@
     <__BLKCNT64-T-TYPE>,
     <__BLKSIZE-T-TYPE>,
     <__CLOCK-T-TYPE>,
-    <__CLOCKID-T-TYPE>,
     <__DADDR-T-TYPE>,
     <__DEV-T-TYPE>,
     <__FILE>,
@@ -4635,8 +4570,6 @@
     <__blksize-t>,
     <__caddr-t>,
     <__clock-t>,
-    <__clockid-t>,
-    <__codecvt-result>,
     <__daddr-t>,
     <__dev-t>,
     <__fsblkcnt-t>,
@@ -4669,13 +4602,8 @@
     <__int32-t>,
     <__int8-t>,
     <__intptr-t>,
-    <__io-close-fn>,
-    <__io-read-fn>,
-    <__io-seek-fn>,
-    <__io-write-fn>,
     <__key-t>,
     <__loff-t>,
-    <__long-double-t>,
     <__mbstate-t>,
     <__mode-t>,
     <__nlink-t>,
@@ -4857,10 +4785,6 @@
     <anonymous-2303>,
     <anonymous-2304>,
     <anonymous-2305>,
-    <anonymous-2307>,
-    <anonymous-2308>,
-    <anonymous-2309>,
-    <anonymous-2310>,
     <anonymous-232>,
     <anonymous-237>,
     <anonymous-2427>,
@@ -6252,8 +6176,6 @@
     <char<@40>>,
     <char<@4>>,
     <clock-t>,
-    <clockid-t*>,
-    <clockid-t>,
     <double*>,
     <fpos-t>,
     <gboolean*>,
@@ -7693,10 +7615,6 @@
     GValueArray-n-values-setter,
     GValueArray-values,
     GValueArray-values-setter,
-    G_fpos64_t-__pos,
-    G_fpos64_t-__pos-setter,
-    G_fpos64_t-__state,
-    G_fpos64_t-__state-setter,
     G_fpos_t-__pos,
     G_fpos_t-__pos-setter,
     G_fpos_t-__state,
@@ -11653,30 +11571,6 @@
     PangoRendererClass-part-changed-setter,
     PangoRendererClass-prepare-run,
     PangoRendererClass-prepare-run-setter,
-    _IO-feof,
-    _IO-ferror,
-    _IO-flockfile,
-    _IO-free-backup-area,
-    _IO-ftrylockfile,
-    _IO-funlockfile,
-    _IO-getc,
-    _IO-padn,
-    _IO-peekc-locked,
-    _IO-putc,
-    _IO-seekoff,
-    _IO-seekpos,
-    _IO-sgetn,
-    _IO-vfprintf,
-    _IO-vfscanf,
-    __overflow,
-    __uflow,
-    __underflow,
-    __woverflow,
-    __wuflow,
-    __wunderflow,
-    _fsid_t-__val,
-    _fsid_t-__val-setter,
-    _g-utf8-make-valid,
     _gconv_info-__data,
     _gconv_info-__data-setter,
     _gconv_info-__nsteps,
@@ -11739,33 +11633,6 @@
     _gconv_trans_data-__trans-end-fct-setter,
     _gconv_trans_data-__trans-fct,
     _gconv_trans_data-__trans-fct-setter,
-    _gtk-action-sync-menu-visible,
-    _gtk-action-sync-sensitive,
-    _gtk-action-sync-visible,
-    _gtk-binding-entry-add-signall,
-    _gtk-binding-parse-binding,
-    _gtk-cell-layout-buildable-add-child,
-    _gtk-cell-layout-buildable-custom-tag-end,
-    _gtk-cell-layout-buildable-custom-tag-start,
-    _gtk-icon-theme-ensure-builtin-cache,
-    _gtk-menu-item-popdown-submenu,
-    _gtk-rc-context-destroy,
-    _gtk-rc-free-widget-class-path,
-    _gtk-rc-match-widget-class,
-    _gtk-rc-parse-widget-class-path,
-    _gtk-rc-style-get-color-hashes,
-    _gtk-rc-style-set-rc-property,
-    _gtk-rc-style-unset-rc-property,
-    _gtk-recent-manager-sync,
-    _gtk-style-shade,
-    _gtk-tooltip-focus-in,
-    _gtk-tooltip-focus-out,
-    _gtk-tooltip-handle-event,
-    _gtk-tooltip-hide,
-    _gtk-tooltip-toggle-keyboard-mode,
-    _gtk-widget-get-cursor-color,
-    _gtk-widget-get-cursor-gc,
-    _gtk-widget-propagate-composited-changed,
     _mbstate_t-__count,
     _mbstate_t-__count-setter,
     _mbstate_t-__value,
@@ -12282,13 +12149,10 @@
     clearerr,
     clearerr-unlocked,
     clock,
-    clock-getcpuclockid,
-    clock-nanosleep,
     ctermid,
     ctime,
     ctime-r,
     difftime,
-    dysize,
     fclose,
     fdopen,
     feof,
@@ -12296,9 +12160,7 @@
     ferror,
     ferror-unlocked,
     fflush,
-    fflush-unlocked,
     fgetc,
-    fgetc-unlocked,
     fgetpos,
     fgets,
     fileno,
@@ -12307,10 +12169,8 @@
     fopen,
     fprintf,
     fputc,
-    fputc-unlocked,
     fputs,
     fread,
-    fread-unlocked,
     freopen,
     fscanf,
     fseek,
@@ -12321,7 +12181,6 @@
     ftrylockfile,
     funlockfile,
     fwrite,
-    fwrite-unlocked,
     g-allocator-free,
     g-allocator-new,
     g-array-append-vals,
@@ -18233,7 +18092,6 @@
     putchar-unlocked,
     puts,
     putw,
-    remove,
     rename,
     rewind,
     scanf,
@@ -18244,7 +18102,6 @@
     snprintf,
     sprintf,
     sscanf,
-    stime,
     strftime,
     tempnam,
     time,
@@ -18271,7 +18128,6 @@
     tkMenuEntry-widget-setter,
     tmpfile,
     tmpnam,
-    tmpnam-r,
     tzset,
     ungetc,
     vfprintf,

Modified: trunk/fundev/sources/gtk/gtk-glue/gtk.dylan
==============================================================================
--- trunk/fundev/sources/gtk/gtk-glue/gtk.dylan	(original)
+++ trunk/fundev/sources/gtk/gtk-glue/gtk.dylan	Sun Feb 24 08:38:13 2008
@@ -2,6 +2,27 @@
 Author:    Hannes Mehnert, Andreas Bogk
 Copyright: (C) 2007,.  All rights reserved.
 
+define constant $G-TYPE-INVALID = as(<machine-word>, 0);
+define constant $G-TYPE-NONE = as(<machine-word>, 4);
+define constant $G-TYPE-CHAR = as(<machine-word>, 12);
+define constant $G-TYPE-UCHAR = as(<machine-word>, 16);
+define constant $G-TYPE-BOOLEAN = as(<machine-word>, 20);
+define constant $G-TYPE-INT = as(<machine-word>, 24);
+define constant $G-TYPE-UINT = as(<machine-word>, 28);
+define constant $G-TYPE-LONG = as(<machine-word>, 32);
+define constant $G-TYPE-ULONG = as(<machine-word>, 36);
+define constant $G-TYPE-INT64 = as(<machine-word>, 40);
+define constant $G-TYPE-UINT64 = as(<machine-word>, 44);
+define constant $G-TYPE-ENUM = as(<machine-word>, 48);
+define constant $G-TYPE-FLAGS = as(<machine-word>, 52);
+define constant $G-TYPE-FLOAT = as(<machine-word>, 56);
+define constant $G-TYPE-DOUBLE = as(<machine-word>, 60);
+define constant $G-TYPE-STRING = as(<machine-word>, 64);
+define constant $G-TYPE-POINTER = as(<machine-word>, 68);
+define constant $G-TYPE-BOXED = as(<machine-word>, 72);
+define constant $G-TYPE-PARAM = as(<machine-word>, 76);
+define constant $G-TYPE-OBJECT = as(<machine-word>, 80);
+
 define C-function g-type-from-instance
   input parameter instance :: <GTypeInstance>;
   result type :: <GType>;
@@ -132,7 +153,7 @@
   end block;
 end function find-gtype-by-name;
 
-define method find-gtype(g-type :: <integer>)
+define function find-gtype(g-type)
  => (type :: false-or(<class>));
   let dylan-type = element($gtype-table, g-type, default: #f);
   unless(dylan-type)
@@ -141,7 +162,7 @@
     $gtype-table[g-type] := dylan-type;
   end unless;
   dylan-type
-end method find-gtype;
+end function find-gtype;
 
 define constant $all-gtype-instances = all-subclasses(<_GTypeInstance>);
 
@@ -175,10 +196,12 @@
   *holding-gdk-lock* := *holding-gdk-lock* - 1;
   if(return-value ~= null-pointer(<gvalue>))
     select(g-value-type(return-value))
-      $G-TYPE-BOOLEAN => g-value-set-boolean(return-value, 
+      $G-TYPE-BOOLEAN => g-value-set-boolean(return-value,
                                              if(res) 1 else 0 end);
       $G-TYPE-NONE, $G-TYPE-INVALID => ;
-      otherwise error("Unsupported GType in return from signal handler.");
+      otherwise =>
+        error("Unsupported GType in return from signal handler: %=.",
+              g-value-type(return-value));
     end select;
   end if;
 end;

Modified: trunk/fundev/sources/gtk/gtk-glue/module.dylan
==============================================================================
--- trunk/fundev/sources/gtk/gtk-glue/module.dylan	(original)
+++ trunk/fundev/sources/gtk/gtk-glue/module.dylan	Sun Feb 24 08:38:13 2008
@@ -10,6 +10,14 @@
   use dylan-primitives;
   use dylan-extensions, import: { debug-name, integer-as-raw, raw-as-integer };
 
+  export $G-TYPE-INVALID, $G-TYPE-NONE,
+    $G-TYPE-CHAR, $G-TYPE-UCHAR, $G-TYPE-BOOLEAN,
+    $G-TYPE-INT, $G-TYPE-UINT, $G-TYPE-LONG,
+    $G-TYPE-ULONG, $G-TYPE-INT64, $G-TYPE-UINT64,
+    $G-TYPE-ENUM, $G-TYPE-FLAGS, $G-TYPE-FLOAT,
+    $G-TYPE-DOUBLE, $G-TYPE-STRING, $G-TYPE-POINTER,
+    $G-TYPE-BOXED, $G-TYPE-PARAM, $G-TYPE-OBJECT;
+
   export g-signal-connect, initialize-gtk,
     gtk-widget-get-window,
     gtk-widget-get-state,

Modified: trunk/fundev/sources/lib/run-time/linux-types.h
==============================================================================
--- trunk/fundev/sources/lib/run-time/linux-types.h	(original)
+++ trunk/fundev/sources/lib/run-time/linux-types.h	Sun Feb 24 08:38:13 2008
@@ -10,7 +10,7 @@
 typedef unsigned char        BYTE;
 typedef int                  BOOL;
 typedef unsigned long        DWORD;
-typedef int64_t              _int64;
+typedef long long            _int64;
 
 #define WINAPI
 

Modified: trunk/fundev/sources/network/unix-network-library.dylan
==============================================================================
--- trunk/fundev/sources/network/unix-network-library.dylan	(original)
+++ trunk/fundev/sources/network/unix-network-library.dylan	Sun Feb 24 08:38:13 2008
@@ -24,7 +24,7 @@
 
   // Misc
   export
-    <C-char**>;
+    <C-char**>, <C-buffer-offset>, <LPSOCKADDR>, <timeval>;
 
   // From sys/socket.h
   export

Modified: trunk/fundev/sources/network/unix-sockets/sockets-extras.dylan
==============================================================================
--- trunk/fundev/sources/network/unix-sockets/sockets-extras.dylan	(original)
+++ trunk/fundev/sources/network/unix-sockets/sockets-extras.dylan	Sun Feb 24 08:38:13 2008
@@ -10,6 +10,12 @@
   export-map <machine-word>, export-function: identity;
 end;
 
+define C-struct <timeval>
+  slot tv_sec :: <C-int>;
+  slot tv_usec :: <C-int>;
+  c-name: "timeval";
+end;
+
 define inline-only C-function unix-recv-buffer
   parameter socket :: <C-int>;
   parameter buffer :: <C-buffer-offset>;

Added: trunk/fundev/sources/registry/x86-freebsd/duim
==============================================================================
--- (empty file)
+++ trunk/fundev/sources/registry/x86-freebsd/duim	Sun Feb 24 08:38:13 2008
@@ -0,0 +1 @@
+abstract://dylan/duim/gtk/duim.lid

Added: trunk/fundev/sources/registry/x86-freebsd/gtk
==============================================================================
--- (empty file)
+++ trunk/fundev/sources/registry/x86-freebsd/gtk	Sun Feb 24 08:38:13 2008
@@ -0,0 +1 @@
+abstract://dylan/gtk/gtk-glue/gtk-linux.hdp

Added: trunk/fundev/sources/registry/x86-freebsd/gtk-c-ffi
==============================================================================
--- (empty file)
+++ trunk/fundev/sources/registry/x86-freebsd/gtk-c-ffi	Sun Feb 24 08:38:13 2008
@@ -0,0 +1 @@
+abstract://dylan/gtk/gtk-c-ffi/gtk-c-ffi-freebsd.hdp

Modified: trunk/fundev/sources/registry/x86-linux/gtk-c-ffi
==============================================================================
--- trunk/fundev/sources/registry/x86-linux/gtk-c-ffi	(original)
+++ trunk/fundev/sources/registry/x86-linux/gtk-c-ffi	Sun Feb 24 08:38:13 2008
@@ -1 +1 @@
-abstract://dylan/gtk/gtk-c-ffi/gtk-c-ffi-unix.hdp
+abstract://dylan/gtk/gtk-c-ffi/gtk-c-ffi-linux.hdp



More information about the chatter mailing list