From 697159978785c49c93a10eeda35a8139aeb6ccb7 Mon Sep 17 00:00:00 2001 From: ram <ram> Date: Mon, 14 May 1990 14:59:33 +0000 Subject: [PATCH] .../systems-work/nnclx/defsystem.lisp, 12-May-90 14:20:02, Edit by Chiles. Added #+CMU :error-file #+CMU nil to appropriate COMPILE-FILE calls. Picked up CMU's CLX-FOREIGN-FILES. I modified this in accordance with new socket.c file which has its own code for opening Unix domain sockets which previously we had to add ourselves. Made LOAD-CLX call CLX-FOREIGN-FILES with no argument when compiling for CMU. Modified file options. --- clx/defsystem.lisp | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/clx/defsystem.lisp b/clx/defsystem.lisp index b711c5950..8c90d7be6 100644 --- a/clx/defsystem.lisp +++ b/clx/defsystem.lisp @@ -1,4 +1,4 @@ -;;; -*- Mode: LISP; Syntax: Common-lisp; Base: 10; Lowercase: Yes; -*- +;;; -*- Mode: Lisp; Package: Xlib; Log: clx.log -*- ;;; ;;; TEXAS INSTRUMENTS INCORPORATED @@ -26,6 +26,8 @@ ;;; kcl ;;; ibcl ;;; excl +;;; CMU +;;; #-ansi-common-lisp (lisp:in-package :xlib :use '(:lisp)) @@ -362,6 +364,20 @@ *foreign-libraries*)) +;;; This loads the C foreign function used to make an IPC connection +;;; to the X11 server. It also defines the necessary types and things +;;; to actually make the foreign call. See the OPEN-X-STREAM function +;;; in the dependent.lisp file. +;;; +#+:CMU +(defun clx-foreign-files () + (ext:def-c-type c-string (ext::null-terminated-string 256)) + (ext:def-c-pointer *c-string c-string) + (ext:def-c-routine ("connect_to_server" xlib::connect-to-server) (ext:int) + (host *c-string) + (port ext:int))) + + ;; socket interface for kcl and ibcl ;; defines the function (open-socket-stream host display) ;; @@ -457,8 +473,9 @@ ;; compile-file defaults correctly. #+(or kcl ibcl) (load source) (if (equal source binary) - (compile-file source) - (compile-file source :output-file binary)) + (compile-file source #+CMU :error-file #+CMU nil) + (compile-file source :output-file binary + #+CMU :error-file #+CMU nil)) (load binary)))) ;; Now compile and load all the files. @@ -577,6 +594,9 @@ #+lucid (clx-foreign-files binary-path) + #+CMU + (clx-foreign-files) + #+(or kcl ibcl) (kcl-socket-init binary-path) -- GitLab