more loading fixes

diff --git a/extra/alien/marshall/marshall.factor b/extra/alien/marshall/marshall.factor
index e8ea0d3754914f1597db1b9404135679105f61ed..d343da0fe0db186bf4284edf13f7b6d4cbb48676 100644 (file)
--- a/extra/alien/marshall/marshall.factor
+++ b/extra/alien/marshall/marshall.factor
@@ -23,7 +23,7 @@ SPECIALIZED-ARRAY: ushort
 SPECIALIZED-ARRAY: void*
 IN: alien.marshall
 
-<< primitive-types [ [ "void*" = ] [ "bool" = ] bi or not ]
+<< primitive-types [ [ void* = ] [ bool = ] bi or not ]
 filter [ define-primitive-marshallers ] each >>
 
 TUPLE: alien-wrapper { underlying alien } ;

diff --git a/extra/freetype/freetype.factor b/extra/freetype/freetype.factor
index c45475cefa30a9b81567e7232959c84e3f9e4f0b..0bfaae98532eb1248df93a8489a140dec895d859 100644 (file)
--- a/extra/freetype/freetype.factor
+++ b/extra/freetype/freetype.factor
@@ -23,7 +23,7 @@ TYPEDEF: ushort FT_UShort
 TYPEDEF: long FT_Long
 TYPEDEF: ulong FT_ULong
 TYPEDEF: uchar FT_Bool
-TYPEDEF: cell FT_Offset
+TYPEDEF: ulong FT_Offset
 TYPEDEF: int FT_PtrDist
 TYPEDEF: char FT_String
 TYPEDEF: int FT_Tag

diff --git a/extra/jamshred/gl/gl.factor b/extra/jamshred/gl/gl.factor
index 1a03a2c9413fecfb786690d93bf79a04400e7882..60e9e39d9f5abf8d3611841355eedb5e683b3a24 100644 (file)
--- a/extra/jamshred/gl/gl.factor
+++ b/extra/jamshred/gl/gl.factor
@@ -4,6 +4,7 @@ USING: accessors alien.c-types jamshred.game jamshred.oint
 jamshred.player jamshred.tunnel kernel math math.constants
 math.functions math.vectors opengl opengl.gl opengl.glu
 opengl.demo-support sequences specialized-arrays ;
+FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float
 IN: jamshred.gl
 

diff --git a/extra/synth/buffers/buffers.factor b/extra/synth/buffers/buffers.factor
index 71b05ac6421f2813af784a4a7012fffae3ea22ab..978fb32d423492a5c7afd22192f3b616648415ad 100644 (file)
--- a/extra/synth/buffers/buffers.factor
+++ b/extra/synth/buffers/buffers.factor
@@ -2,6 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types combinators kernel locals math
 math.ranges openal sequences sequences.merged specialized-arrays ;
+FROM: alien.c-types => short ;
 SPECIALIZED-ARRAY: uchar
 SPECIALIZED-ARRAY: short
 IN: synth.buffers