Index: /trunk/source/level-1/l1-streams.lisp
===================================================================
--- /trunk/source/level-1/l1-streams.lisp	(revision 8397)
+++ /trunk/source/level-1/l1-streams.lisp	(revision 8398)
@@ -5212,5 +5212,5 @@
             (if timeout
               (multiple-value-bind (seconds millis) (milliseconds timeout)
-                (#_gettimeofday now +null-ptr+)
+                (#_gettimeofday now (%null-ptr))
                 (setq timeout (+ (* seconds 1000) millis))
                 (+ (timeval->milliseconds now) timeout)))))
@@ -5226,5 +5226,5 @@
         ;; If there was no timeout, continue to wait forever.
         (when timeout
-          (#_gettimeofday now +null-ptr+)
+          (#_gettimeofday now (%null-ptr))
           (setq timeout (- wait-end (timeval->milliseconds now)))
           (if (<= timeout 0)
@@ -5243,5 +5243,5 @@
             (if timeout
               (multiple-value-bind (seconds millis) (milliseconds timeout)
-                (#_gettimeofday now +null-ptr+)
+                (#_gettimeofday now (%null-ptr))
                 (setq timeout (+ (* seconds 1000) millis))
                 (+ (timeval->milliseconds now) timeout)))))
@@ -5257,5 +5257,5 @@
         ;; If there was no timeout, continue to wait forever.
         (when timeout
-          (#_gettimeofday now +null-ptr+)
+          (#_gettimeofday now (%null-ptr))
           (setq timeout (- wait-end (timeval->milliseconds now)))
           (if (<= timeout 0)
Index: /trunk/source/level-1/linux-files.lisp
===================================================================
--- /trunk/source/level-1/linux-files.lisp	(revision 8397)
+++ /trunk/source/level-1/linux-files.lisp	(revision 8398)
@@ -1323,5 +1323,5 @@
                   (fd-close fd)
                   (error "Can't make a vector with ~s elements in this implementation." (+ ndata-elements nalignment-elements)))
-                (let* ((addr (#_mmap +null-ptr+
+                (let* ((addr (#_mmap (%null-ptr)
                                      nbytes
                                      #$PROT_NONE