X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fwin32-os.lisp;h=b5489051497f6240fb8fbec2cdb3a09c5da17956;hb=18dc0069cd514c976042766ab9a785c970fe1603;hp=ea085e5eca1c2d546511035af8a1a9c88cd4a1bc;hpb=fdf46e7bd7aba9b5c8af629fdb2692d9b33b9207;p=sbcl.git

diff --git a/src/code/win32-os.lisp b/src/code/win32-os.lisp
index ea085e5..b548905 100644
--- a/src/code/win32-os.lisp
+++ b/src/code/win32-os.lisp
@@ -24,15 +24,20 @@
   #!+sb-doc
   "Return a string describing version of the supporting software, or NIL
   if not available."
-  ;; FIXME: Implement.
-  nil)
+  (or *software-version*
+      (setf *software-version*
+            (multiple-value-bind
+                  (major-version minor-version build-number platform-id csd-version)
+                (sb!win32:get-version-ex)
+              (declare (ignore platform-id))
+              (format nil (if (zerop (length csd-version))
+                              "~A.~A.~A"
+                              "~A.~A.~A (~A)")
+                      major-version minor-version build-number csd-version)))))
 
 ;;; Return user time, system time, and number of page faults.
 (defun get-system-info ()
-  ;; FIXME: number of page faults is always zero
-  (multiple-value-bind (creation-time exit-time kernel-time user-time)
-      (sb!win32:get-process-times)
-    (declare (ignore creation-time exit-time))
+  (sb!win32:with-process-times (creation-time exit-time kernel-time user-time)
     (values (floor user-time 10) (floor kernel-time 10) 0)))
 
 ;;; Return the system page size.
@@ -41,3 +46,7 @@
   ;; FIXME: Or we could just get rid of this, since the uses of it look
   ;; disposable.
   4096)
+
+;;; support for CL:MACHINE-VERSION defined OAOO elsewhere
+(defun get-machine-version ()
+  nil)