r5419: *** empty log message ***

diff --git a/io-openmcl.lisp b/io-openmcl.lisp
deleted file mode 100644 (file)
index a42e98c..0000000
--- a/io-openmcl.lisp
+++ /dev/null
@@ -1,12 +0,0 @@
-(in-package #:kmrcl)
-
-(defun open-device-stream (path direction)
-  (let* ((mode (ecase direction
-                (:input #$O_RDONLY)
-                (:output #$O_WRONLY)
-                (:io #$O_RDWR)))
-        (fd (ccl::fd-open (ccl::native-translated-namestring path) mode)))
-    (if (< fd 0)
-       (ccl::signal-file-error fd path)
-       (ccl::make-fd-stream fd :direction direction))))
-

diff --git a/io.lisp b/io.lisp
index 4134bd669966f63104bd06416be4ebfe069f3c24..47fc178f5ed914712b8186a52db7c40531b0c2db 100644 (file)
--- a/io.lisp
+++ b/io.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;

-;;;; $Id: io.lisp,v 1.14 2003/07/30 23:01:46 kevin Exp $
+;;;; $Id: io.lisp,v 1.15 2003/07/31 17:03:37 kevin Exp $

 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -170,6 +170,18 @@
 
 
 
 
 
 

+#+openmcl
+(defun open-device-stream (path direction)
+  (let* ((mode (ecase direction
+                (:input #.(read-from-string "#$O_RDONLY"))
+                (:output #.(read-from-string "#$O_WRONLY"))
+                (:io #.(read-from-string "#$O_RDWR"))))
+        (fd (ccl::fd-open (ccl::native-translated-namestring path) mode)))
+    (if (< fd 0)
+       (ccl::signal-file-error fd path)
+       (ccl::make-fd-stream fd :direction direction))))
+
+

 (defun null-output-stream ()
   #-openmcl
   (when (probe-file #p"/dev/null")
 (defun null-output-stream ()
   #-openmcl
   (when (probe-file #p"/dev/null")

diff --git a/kmrcl.asd b/kmrcl.asd
index fcb76389f626b7f3b01c08f92c0034975c0c9fe6..06ff082047a9401322d13ccb1db2d083b6fb0739 100644 (file)
--- a/kmrcl.asd
+++ b/kmrcl.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;

-;;;; $Id: kmrcl.asd,v 1.45 2003/07/30 23:02:53 kevin Exp $
+;;;; $Id: kmrcl.asd,v 1.46 2003/07/31 17:03:37 kevin Exp $

 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -37,8 +37,7 @@
      (:file "functions" :depends-on ("macros"))
      (:file "lists" :depends-on ("macros"))
      (:file "seqs" :depends-on ("macros"))
      (:file "functions" :depends-on ("macros"))
      (:file "lists" :depends-on ("macros"))
      (:file "seqs" :depends-on ("macros"))

-     #+openmcl (:file "io-openmcl" :depends-on ("macros"))
-     (:file "io" :depends-on ("macros" #+openmcl "io-openmcl"))
+     (:file "io" :depends-on ("macros"))

      (:file "console" :depends-on ("macros"))
      (:file "strings" :depends-on ("macros" "seqs"))
      (:file "strmatch" :depends-on ("strings"))
      (:file "console" :depends-on ("macros"))
      (:file "strings" :depends-on ("macros" "seqs"))
      (:file "strmatch" :depends-on ("strings"))