From a3e5e64eab9946a08fec30b65f78d6a9d03f5220 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sun, 23 May 2010 22:08:24 -0400
Subject: [PATCH 1/2] ui.backend.x11: fix load error

---
 basis/ui/backend/x11/x11.factor | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/basis/ui/backend/x11/x11.factor b/basis/ui/backend/x11/x11.factor
index ef0618dff3..d43f814eef 100644
--- a/basis/ui/backend/x11/x11.factor
+++ b/basis/ui/backend/x11/x11.factor
@@ -1,14 +1,15 @@
 ! Copyright (C) 2005, 2010 Eduardo Cavazos and Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types ascii assocs classes.struct combinators
-combinators.short-circuit command-line environment io.encodings.ascii
-io.encodings.string io.encodings.utf8 kernel literals locals math
-namespaces sequences specialized-arrays.instances.alien.c-types.uchar
+USING: accessors alien.c-types alien.data ascii assocs classes.struct
+combinators combinators.short-circuit command-line environment
+io.encodings.ascii io.encodings.string io.encodings.utf8 kernel
+literals locals math namespaces sequences specialized-arrays
 strings ui ui.backend ui.clipboards ui.event-loop ui.gadgets
 ui.gadgets.private ui.gadgets.worlds ui.gestures ui.pixel-formats
 ui.pixel-formats.private ui.private x11 x11.clipboard x11.constants
 x11.events x11.glx x11.io x11.windows x11.xim x11.xlib ;
 FROM: unix.ffi => system ;
+SPECIALIZED-ARRAY: uchar
 IN: ui.backend.x11
 
 SINGLETON: x11-ui-backend
@@ -60,7 +61,7 @@ M: x11-ui-backend (pixel-format-attribute)
     [ handle>> ] [ >glx-visual ] bi*
     [ 2drop f ] [
         first
-        { int } [ glXGetConfig drop ] with-out-parameters
+        { int } [ glXGetConfig drop ] [ ] with-out-parameters
     ] if-empty ;
 
 CONSTANT: modifiers

From fa53b4ab2ad72da9d454cb5b9e29ea81a6469a62 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 23 May 2010 22:23:44 -0400
Subject: [PATCH 2/2] opengl.gl.unix renamed to opengl.gl.x11

---
 basis/opengl/gl/extensions/extensions.factor         | 2 +-
 basis/opengl/gl/{unix => x11}/authors.txt            | 0
 basis/opengl/gl/{unix => x11}/platforms.txt          | 0
 basis/opengl/gl/{unix/unix.factor => x11/x11.factor} | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename basis/opengl/gl/{unix => x11}/authors.txt (100%)
 rename basis/opengl/gl/{unix => x11}/platforms.txt (100%)
 rename basis/opengl/gl/{unix/unix.factor => x11/x11.factor} (92%)

diff --git a/basis/opengl/gl/extensions/extensions.factor b/basis/opengl/gl/extensions/extensions.factor
index 530f3ada6c..1c6cd3d9ed 100644
--- a/basis/opengl/gl/extensions/extensions.factor
+++ b/basis/opengl/gl/extensions/extensions.factor
@@ -7,7 +7,7 @@ ERROR: unknown-gl-platform ;
 << {
     { [ os windows? ] [ "opengl.gl.windows" ] }
     { [ os macosx? ]  [ "opengl.gl.macosx" ] }
-    { [ os unix? ] [ "opengl.gl.unix" ] }
+    { [ os unix? ] [ "opengl.gl.x11" ] }
     [ unknown-gl-platform ]
 } cond use-vocab >>
 
diff --git a/basis/opengl/gl/unix/authors.txt b/basis/opengl/gl/x11/authors.txt
similarity index 100%
rename from basis/opengl/gl/unix/authors.txt
rename to basis/opengl/gl/x11/authors.txt
diff --git a/basis/opengl/gl/unix/platforms.txt b/basis/opengl/gl/x11/platforms.txt
similarity index 100%
rename from basis/opengl/gl/unix/platforms.txt
rename to basis/opengl/gl/x11/platforms.txt
diff --git a/basis/opengl/gl/unix/unix.factor b/basis/opengl/gl/x11/x11.factor
similarity index 92%
rename from basis/opengl/gl/unix/unix.factor
rename to basis/opengl/gl/x11/x11.factor
index c0a0218ed2..2d752757bb 100644
--- a/basis/opengl/gl/unix/unix.factor
+++ b/basis/opengl/gl/x11/x11.factor
@@ -1,5 +1,5 @@
 USING: alien kernel x11.glx ;
-IN: opengl.gl.unix
+IN: opengl.gl.x11
 
 : gl-function-context ( -- context ) glXGetCurrentContext ; inline
 : gl-function-address ( name -- address ) glXGetProcAddressARB ; inline