From eb07fbdc7c31739881057b7a5e67fcb3536fe536 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 17 Jan 2008 11:04:09 +1300
Subject: [PATCH] Fix ogg libraries for recent factor changes

---
 extra/ogg/ogg.factor           | 15 +++++++--------
 extra/ogg/theora/theora.factor | 15 +++++++--------
 extra/ogg/vorbis/vorbis.factor | 15 +++++++--------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/extra/ogg/ogg.factor b/extra/ogg/ogg.factor
index 9d6647858f..b0a78e1490 100644
--- a/extra/ogg/ogg.factor
+++ b/extra/ogg/ogg.factor
@@ -4,14 +4,13 @@
 USING: kernel system combinators alien alien.syntax ;
 IN: ogg
 
-: load-ogg-library ( -- )
-    "ogg" {
-        { [ win32? ]  [ "ogg.dll" ] }
-        { [ macosx? ] [ "libogg.0.dylib" ] }
-        { [ unix? ]   [ "libogg.so" ] }
-    } cond "cdecl" add-library ; parsing
-
-load-ogg-library
+<<
+"ogg" {
+    { [ win32? ]  [ "ogg.dll" ] }
+    { [ macosx? ] [ "libogg.0.dylib" ] }
+    { [ unix? ]   [ "libogg.so" ] }
+} cond "cdecl" add-library
+>>
 
 LIBRARY: ogg
 
diff --git a/extra/ogg/theora/theora.factor b/extra/ogg/theora/theora.factor
index 325fb91dad..0d9748a6f3 100644
--- a/extra/ogg/theora/theora.factor
+++ b/extra/ogg/theora/theora.factor
@@ -4,14 +4,13 @@
 USING: kernel system combinators alien alien.syntax ;
 IN: ogg.theora
 
-: load-theora-library ( -- )
-    "theora" {
-        { [ win32? ]  [ "libtheora.dll" ] }
-        { [ macosx? ] [ "libtheora.0.dylib" ] }
-        { [ unix? ]   [ "libtheora.so" ] }
-    } cond "cdecl" add-library ; parsing
-
-load-theora-library
+<<
+"theora" {
+    { [ win32? ]  [ "libtheora.dll" ] }
+    { [ macosx? ] [ "libtheora.0.dylib" ] }
+    { [ unix? ]   [ "libtheora.so" ] }
+} cond "cdecl" add-library
+>>
 
 LIBRARY: theora
 
diff --git a/extra/ogg/vorbis/vorbis.factor b/extra/ogg/vorbis/vorbis.factor
index e6e08efb0a..eff28b69ca 100644
--- a/extra/ogg/vorbis/vorbis.factor
+++ b/extra/ogg/vorbis/vorbis.factor
@@ -4,14 +4,13 @@
 USING: kernel system combinators alien alien.syntax ;
 IN: ogg.vorbis
 
-: load-vorbis-library ( -- )
-    "vorbis" {
-        { [ win32? ]  [ "vorbis.dll" ] }
-        { [ macosx? ] [ "libvorbis.0.dylib" ] }
-        { [ unix? ]   [ "libvorbis.so" ] }
-    } cond "cdecl" add-library ; parsing
-
-load-vorbis-library
+<<
+"vorbis" {
+    { [ win32? ]  [ "vorbis.dll" ] }
+    { [ macosx? ] [ "libvorbis.0.dylib" ] }
+    { [ unix? ]   [ "libvorbis.so" ] }
+} cond "cdecl" add-library 
+>>
 
 LIBRARY: vorbis