From e117300bb4df561851e790f689bde0ab08db69ac Mon Sep 17 00:00:00 2001
From: Erik Charlebois <erikcharlebois@gmail.com>
Date: Sat, 10 Apr 2010 22:38:17 -0700
Subject: [PATCH] Fix build breaks

---
 extra/gpu/demos/bunny/bunny.factor       | 4 ++--
 extra/gpu/demos/raytrace/raytrace.factor | 2 +-
 extra/macho/macho.factor                 | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/extra/gpu/demos/bunny/bunny.factor b/extra/gpu/demos/bunny/bunny.factor
index bee94d302a..ae5757efcd 100644
--- a/extra/gpu/demos/bunny/bunny.factor
+++ b/extra/gpu/demos/bunny/bunny.factor
@@ -34,12 +34,12 @@ GLSL-SHADER-FILE: window-vertex-shader vertex-shader "window.v.glsl"
 GLSL-SHADER-FILE: sobel-fragment-shader fragment-shader "sobel.f.glsl"
 GLSL-PROGRAM: sobel-program
     window-vertex-shader sobel-fragment-shader
-    window-vertex ;
+    window-vertex-format ;
 
 GLSL-SHADER-FILE: loading-fragment-shader fragment-shader "loading.f.glsl"
 GLSL-PROGRAM: loading-program
     window-vertex-shader loading-fragment-shader
-    window-vertex ;
+    window-vertex-format ;
 
 TUPLE: bunny-state
     vertexes
diff --git a/extra/gpu/demos/raytrace/raytrace.factor b/extra/gpu/demos/raytrace/raytrace.factor
index 2ad6c82d7c..bdd1b51deb 100644
--- a/extra/gpu/demos/raytrace/raytrace.factor
+++ b/extra/gpu/demos/raytrace/raytrace.factor
@@ -10,7 +10,7 @@ GLSL-SHADER-FILE: raytrace-vertex-shader vertex-shader "raytrace.v.glsl"
 GLSL-SHADER-FILE: raytrace-fragment-shader fragment-shader "raytrace.f.glsl"
 GLSL-PROGRAM: raytrace-program
     raytrace-vertex-shader raytrace-fragment-shader
-    window-vertex ;
+    window-vertex-format ;
 
 UNIFORM-TUPLE: sphere-uniforms
     { "center" vec3-uniform  f }
diff --git a/extra/macho/macho.factor b/extra/macho/macho.factor
index ea71583072..d371b3ac72 100644
--- a/extra/macho/macho.factor
+++ b/extra/macho/macho.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http:// factorcode.org/license.txt for BSD license.
-USING: alien.c-types alien.syntax classes.struct kernel literals math
-unix.types ;
+USING: alien.c-types alien.syntax classes.struct kernel literals math unix.types ;
 IN: macho
 
 TYPEDEF: int       integer_t
@@ -524,7 +523,7 @@ CONSTANT: CPU_TYPE_VAX            1
 CONSTANT: CPU_TYPE_MC680x0        6
 CONSTANT: CPU_TYPE_X86            7
 CONSTANT: CPU_TYPE_I386           $ CPU_TYPE_X86
-CONSTANT: CPU_TYPE_X86_64         $[ CPU_TYPE_X86 CPU_ARCH_ABI64 bitor ]
+CONSTANT: CPU_TYPE_X86_64         $[ $ CPU_TYPE_X86 $ CPU_ARCH_ABI64 bitor ]
 CONSTANT: CPU_TYPE_MC98000        10
 CONSTANT: CPU_TYPE_HPPA           11
 CONSTANT: CPU_TYPE_ARM            12
@@ -532,7 +531,7 @@ CONSTANT: CPU_TYPE_MC88000        13
 CONSTANT: CPU_TYPE_SPARC          14
 CONSTANT: CPU_TYPE_I860           15
 CONSTANT: CPU_TYPE_POWERPC        18
-CONSTANT: CPU_TYPE_POWERPC64      $[ $ CPU_TYPE_POWERPC CPU_ARCH_ABI64 bitor ]
+CONSTANT: CPU_TYPE_POWERPC64      $[ $ CPU_TYPE_POWERPC $ CPU_ARCH_ABI64 bitor ]
 
 CONSTANT: CPU_SUBTYPE_MASK    HEX: ff000000
 CONSTANT: CPU_SUBTYPE_LIB64   HEX: 80000000