From f0f309b4b48c73b7aba30d54b568b4a3d63b1a94 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 17 Jan 2008 11:26:33 +1300
Subject: [PATCH] Fix sqlite and sqlite.tuple-db for factor changes

---
 extra/sqlite/lib/lib.factor                | 15 +++++++--------
 extra/sqlite/sqlite-docs.factor            |  2 +-
 extra/sqlite/tuple-db/tuple-db-docs.factor |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/extra/sqlite/lib/lib.factor b/extra/sqlite/lib/lib.factor
index d544b8f888..438f22a80f 100644
--- a/extra/sqlite/lib/lib.factor
+++ b/extra/sqlite/lib/lib.factor
@@ -12,14 +12,13 @@ IN: sqlite.lib
 USING: alien compiler kernel math namespaces sequences strings alien.syntax
     system combinators ;
 
-: load-sqlite-library ( -- )
-  "sqlite" {
-    { [ win32? ]  [ "sqlite3.dll" ] }
-    { [ macosx? ] [ "/usr/lib/libsqlite3.dylib" ] }
-    { [ unix? ]  [ "libsqlite3.so" ] }
-  } cond "cdecl" add-library ; parsing
-
-load-sqlite-library
+<<
+"sqlite" {
+  { [ win32? ]  [ "sqlite3.dll" ] }
+  { [ macosx? ] [ "/usr/lib/libsqlite3.dylib" ] }
+  { [ unix? ]  [ "libsqlite3.so" ] }
+} cond "cdecl" add-library
+>>
 
 ! Return values from sqlite functions
 : SQLITE_OK           0   ; inline ! Successful result
diff --git a/extra/sqlite/sqlite-docs.factor b/extra/sqlite/sqlite-docs.factor
index 7bdec6efa4..d58b553f11 100644
--- a/extra/sqlite/sqlite-docs.factor
+++ b/extra/sqlite/sqlite-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help sqlite help.syntax help.markup ;
+USING: help help.syntax help.markup ;
 IN: sqlite
 
 HELP: sqlite-open 
diff --git a/extra/sqlite/tuple-db/tuple-db-docs.factor b/extra/sqlite/tuple-db/tuple-db-docs.factor
index 795836fa56..3c6df0eaa6 100644
--- a/extra/sqlite/tuple-db/tuple-db-docs.factor
+++ b/extra/sqlite/tuple-db/tuple-db-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help sqlite sqlite.tuple-db help.syntax help.markup ;
+USING: help sqlite help.syntax help.markup ;
 IN: sqlite.tuple-db
 
 ARTICLE: { "sqlite" "tuple-db-loading" } "Loading"