Index: /trunk/ccl/level-1/l1-sockets.lisp
===================================================================
--- /trunk/ccl/level-1/l1-sockets.lisp	(revision 4993)
+++ /trunk/ccl/level-1/l1-sockets.lisp	(revision 4994)
@@ -410,8 +410,8 @@
 (defun path-from-unix-address (addr)
   (when (= #$AF_LOCAL (pref addr :sockaddr_un.sun_family))
-    #+darwinppc-target
+    #+darwin-target
     (%str-from-ptr (pref addr :sockaddr_un.sun_path)
 		   (- (pref addr :sockaddr_un.sun_len) 2))
-    #-darwinppc-target
+    #-darwinc-target
     (%get-cstring (pref addr :sockaddr_un.sun_path))))
 
@@ -972,5 +972,5 @@
             
 
-#+(or darwinppc-target freebsd-target)
+#+(or darwin-target freebsd-target)
 (defun c_gethostbyaddr (addr)
   (rlet ((addrp :unsigned))
@@ -1002,5 +1002,5 @@
 	       (values nil (- (pref herr :signed)))))))))))
 
-#+(or darwinppc-target freebsd-target)
+#+(or darwin-target freebsd-target)
 (defun c_gethostbyname (name)
   (with-cstrs ((name (string name)))
@@ -1052,9 +1052,9 @@
 ;;; seems to lose the :struct, so just using #_ doesn't work (that
 ;;; sounds like a bug in the FFI translator.)
-#+(or darwinppc-target linuxx8664-target freebsd-target)
+#+(or darwin-target linuxx8664-target freebsd-target)
 (defun _inet_ntoa (addr)
   (with-macptrs ((p))
-    (%setf-macptr p (external-call #+darwinppc-target "_inet_ntoa"
-                                   #-darwinppc-target "inet_ntoa"
+    (%setf-macptr p (external-call #+darwin-target "_inet_ntoa"
+                                   #-darwin-target "inet_ntoa"
 				   :unsigned-fullword addr
 				   :address))
@@ -1118,7 +1118,7 @@
 
 (defun c_bind (sockfd sockaddr addrlen)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
-  (progn
-    #+(or darwinppc-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
+  (progn
+    #+(or darwin-target freebsd-target)
     (setf (pref sockaddr :sockaddr_in.sin_len) addrlen)
     (syscall syscalls::bind sockfd sockaddr addrlen))
@@ -1139,5 +1139,5 @@
 
 (defun c_connect (sockfd addr len)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::connect sockfd addr len)
   #+linuxppc-target
@@ -1157,5 +1157,5 @@
 
 (defun c_listen (sockfd backlog)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::listen sockfd backlog)
   #+linuxppc-target
@@ -1173,5 +1173,5 @@
 
 (defun c_accept (sockfd addrp addrlenp)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::accept sockfd addrp addrlenp)
   #+linuxppc-target
@@ -1191,5 +1191,5 @@
 
 (defun c_getsockname (sockfd addrp addrlenp)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::getsockname sockfd addrp addrlenp)
   #+linuxppc-target
@@ -1209,5 +1209,5 @@
 
 (defun c_getpeername (sockfd addrp addrlenp)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::getpeername sockfd addrp addrlenp)
   #+linuxppc-target
@@ -1227,5 +1227,5 @@
 
 (defun c_socketpair (domain type protocol socketsptr)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::socketpair domain type protocol socketsptr)
   #+linuxppc-target
@@ -1249,5 +1249,5 @@
 
 (defun c_sendto (sockfd msgptr len flags addrp addrlen)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::sendto sockfd msgptr len flags addrp addrlen)
   #+linuxppc-target
@@ -1273,5 +1273,5 @@
 
 (defun c_recvfrom (sockfd bufptr len flags addrp addrlenp)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::recvfrom sockfd bufptr len flags addrp addrlenp)
   #+linuxppc-target
@@ -1297,5 +1297,5 @@
 
 (defun c_shutdown (sockfd how)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::shutdown sockfd how)
   #+linuxppc-target
@@ -1313,5 +1313,5 @@
 
 (defun c_setsockopt (sockfd level optname optvalp optlen)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::setsockopt sockfd level optname optvalp optlen)
   #+linuxppc-target
@@ -1335,5 +1335,5 @@
 
 (defun c_getsockopt (sockfd level optname optvalp optlenp)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::getsockopt sockfd level optname optvalp optlenp)
   #+linuxppc-target
@@ -1357,5 +1357,5 @@
 
 (defun c_sendmsg (sockfd msghdrp flags)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::sendmsg sockfd msghdrp flags)
   #+linuxppc-target
@@ -1375,5 +1375,5 @@
 
 (defun c_recvmsg (sockfd msghdrp flags)
-  #+(or darwinppc-target linuxx8664-target freebsd-target)
+  #+(or darwin-target linuxx8664-target freebsd-target)
   (syscall syscalls::recvmsg sockfd msghdrp flags)
   #+linuxppc-target
Index: /trunk/ccl/level-1/linux-files.lisp
===================================================================
--- /trunk/ccl/level-1/linux-files.lisp	(revision 4993)
+++ /trunk/ccl/level-1/linux-files.lisp	(revision 4994)
@@ -244,5 +244,5 @@
    #+linux-target
    (#_ __fxstat #$_STAT_VER_LINUX fd stat)
-   #+(or darwinppc-target freebsd-target)
+   #-linux-target
    (syscall syscalls::fstat fd stat)
    stat))
@@ -293,5 +293,5 @@
   (if (eql 0 result)
     (%get-cstring (%inc-ptr buf (* #+linux-target #$_UTSNAME_LENGTH
-				   #+darwinppc-target #$_SYS_NAMELEN
+				   #+darwin-target #$_SYS_NAMELEN
                                    #+freebsd-target #$SYS_NMLN idx)))
     "unknown"))
@@ -303,5 +303,5 @@
     (%uts-string (syscall syscalls::uname buf) idx buf)))
 
-#+darwinppc-target
+#+darwin-target
 (defun %uname (idx)
   (%stack-block ((buf (* #$_SYS_NAMELEN 5)))
@@ -509,5 +509,5 @@
 	    (unload-library-entrypoints lib)))))))
 
-#+darwinppc-target
+#+darwin-target
 ;; completely specifies whether to remove it totally from our list
 (defun close-shared-library (lib &key (completely nil))
@@ -603,5 +603,5 @@
 ;;; I believe that the Darwin/FreeBSD syscall infterface is rather ... odd.
 ;;; Use libc's interface.
-#+(or darwinppc-target freebsd-target)
+#+(or darwin-target freebsd-target)
 (defun pipe ()
   (%stack-block ((pipes 8))
@@ -1089,5 +1089,5 @@
   (or *cpu-count*
       (setq *cpu-count*
-            #+darwinppc-target
+            #+darwin-target
             (rlet ((info :host_basic_info)
                    (count :mach_msg_type_number_t #$HOST_BASIC_INFO_COUNT))