* interp/sockio.lisp: Remove.

6 files changed, 35 insertions, 129 deletions

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 51785beb..5b4c985d 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -68,7 +68,7 @@ OBJS=	types.$(FASLEXT)	sys-os.$(FASLEXT) \
 	setvars.$(FASLEXT)	\
 	sfsfun-l.$(FASLEXT)	sfsfun.$(FASLEXT)	\
 	simpbool.$(FASLEXT)	slam.$(FASLEXT)	\
-	sockio.$(FASLEXT)	spad.$(FASLEXT)	\
+	spad.$(FASLEXT)	\
 	spaderror.$(FASLEXT)				\
 	template.$(FASLEXT)	termrw.$(FASLEXT)	\
 	trace.$(FASLEXT)	\
@@ -325,7 +325,7 @@ hypertex.$(FASLEXT): hypertex.boot types.$(FASLEXT)
 
 ## OpenAxiom's interpreter.
 
-patches.$(FASLEXT): patches.lisp macros.$(FASLEXT) sockio.$(FASLEXT) \
+patches.$(FASLEXT): patches.lisp macros.$(FASLEXT) \
 		g-timer.$(FASLEXT) sys-driver.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
@@ -754,11 +754,7 @@ sys-utility.$(FASLEXT): sys-utility.boot vmlisp.$(FASLEXT) sys-os.$(FASLEXT)
 vmlisp.$(FASLEXT): vmlisp.lisp types.$(FASLEXT) sys-globals.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
-sys-os.$(FASLEXT): sys-os.boot types.$(FASLEXT) \
-		cfuns.$(FASLEXT) sockio.$(FASLEXT)
-	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
-
-sockio.$(FASLEXT): sockio.lisp boot-pkg.$(FASLEXT)
+sys-os.$(FASLEXT): sys-os.boot types.$(FASLEXT) cfuns.$(FASLEXT) 
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 types.$(FASLEXT): types.boot boot-pkg.$(FASLEXT)
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index e58f3b1a..461b0f66 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -147,7 +147,7 @@ OBJS=	types.$(FASLEXT)	sys-os.$(FASLEXT) \
 	setvars.$(FASLEXT)	\
 	sfsfun-l.$(FASLEXT)	sfsfun.$(FASLEXT)	\
 	simpbool.$(FASLEXT)	slam.$(FASLEXT)	\
-	sockio.$(FASLEXT)	spad.$(FASLEXT)	\
+	spad.$(FASLEXT)	\
 	spaderror.$(FASLEXT)				\
 	template.$(FASLEXT)	termrw.$(FASLEXT)	\
 	trace.$(FASLEXT)	\
@@ -627,7 +627,7 @@ hypertex.$(FASLEXT): hypertex.boot types.$(FASLEXT)
 
 ## OpenAxiom's interpreter.
 
-patches.$(FASLEXT): patches.lisp macros.$(FASLEXT) sockio.$(FASLEXT) \
+patches.$(FASLEXT): patches.lisp macros.$(FASLEXT) \
 		g-timer.$(FASLEXT) sys-driver.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
@@ -1056,11 +1056,7 @@ sys-utility.$(FASLEXT): sys-utility.boot vmlisp.$(FASLEXT) sys-os.$(FASLEXT)
 vmlisp.$(FASLEXT): vmlisp.lisp types.$(FASLEXT) sys-globals.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
-sys-os.$(FASLEXT): sys-os.boot types.$(FASLEXT) \
-		cfuns.$(FASLEXT) sockio.$(FASLEXT)
-	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
-
-sockio.$(FASLEXT): sockio.lisp boot-pkg.$(FASLEXT)
+sys-os.$(FASLEXT): sys-os.boot types.$(FASLEXT) cfuns.$(FASLEXT) 
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 types.$(FASLEXT): types.boot boot-pkg.$(FASLEXT)
diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp
index c1fd5781..315b5649 100644
--- a/src/interp/patches.lisp
+++ b/src/interp/patches.lisp
@@ -32,7 +32,6 @@
 ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 (import-module "macros")
-(import-module "sockio")
 (import-module "g-timer")
 (import-module "sys-driver")
 (in-package "BOOT")
diff --git a/src/interp/sockio.lisp b/src/interp/sockio.lisp
deleted file mode 100644
index 0ed33463..00000000
--- a/src/interp/sockio.lisp
+++ /dev/null
@@ -1,113 +0,0 @@
-;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
-;; All rights reserved.
-;; Copyright (C) 2007-2008, Gabriel Dos Reis.
-;; All rights reserved.
-;;
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions are
-;; met:
-;;
-;;     - Redistributions of source code must retain the above copyright
-;;       notice, this list of conditions and the following disclaimer.
-;;
-;;     - Redistributions in binary form must reproduce the above copyright
-;;       notice, this list of conditions and the following disclaimer in
-;;       the documentation and/or other materials provided with the
-;;       distribution.
-;;
-;;     - Neither the name of The Numerical Algorithms Group Ltd. nor the
-;;       names of its contributors may be used to endorse or promote products
-;;       derived from this software without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-(import-module "boot-pkg")
-(in-package "BOOT")
-
-;; Macros for use in Boot
-
-;; Socket types.  This list must be consistent with the one in com.h
-
-(defconstant SessionManager     1)
-(defconstant ViewportServer     2)
-(defconstant MenuServer         3)
-(defconstant SessionIO          4)
-(defconstant MessageServer      5)
-(defconstant InterpWindow       6)
-(defconstant KillSpad           7)
-(defconstant DebugWindow        8)
-(defconstant Forker             9)
-
-;; same constants for use in BOOT
-(defconstant |$SessionManager|  SessionManager)
-(defconstant |$ViewportServer|  ViewportServer)
-(defconstant |$MenuServer|      MenuServer)
-(defconstant |$SessionIO|       SessionIO)
-(defconstant |$MessageServer|   MessageServer)
-(defconstant |$InterpWindow|    InterpWindow)
-(defconstant |$KillSpad|        KillSpad)
-(defconstant |$DebugWindow|     DebugWindow)
-(defconstant |$Forker|          Forker)
-
-;; Session Manager action requests
-
-(defconstant CreateFrame        1)
-(defconstant SwitchFrames       2)
-(defconstant EndOfOutput        3)
-(defconstant CallInterp         4)
-(defconstant EndSession         5)
-(defconstant LispCommand        6)
-(defconstant SpadCommand        7)
-(defconstant SendXEventToHyperTeX 8)
-(defconstant QuietSpadCommand   9)
-(defconstant CloseClient        10)
-(defconstant QueryClients       11)
-(defconstant QuerySpad          12)
-(defconstant NonSmanSession     13)
-(defconstant KillLispSystem     14)
-
-(defconstant |$CreateFrame|     CreateFrame)
-(defconstant |$SwitchFrames|    SwitchFrames)
-(defconstant |$EndOfOutput|     EndOfOutput)
-(defconstant |$CallInterp|      CallInterp)
-(defconstant |$EndSession|      EndSession)
-(defconstant |$LispCommand|     LispCommand)
-(defconstant |$SpadCommand|     SpadCommand)
-(defconstant |$SendXEventToHyperTeX| SendXEventToHyperTeX)
-(defconstant |$QuietSpadCommand| QuietSpadCommand)
-(defconstant |$CloseClient|     CloseClient)
-(defconstant |$QueryClients|    QueryClients)
-(defconstant |$QuerySpad|       QuerySpad)
-(defconstant |$NonSmanSession|  NonSmanSession)
-(defconstant |$KillLispSystem|  KillLispSystem)
-
-;; signal types (from /usr/include/sys/signal.h)
-#+(and :Lucid (not :ibm/370))
-(progn 
-  (defconstant  SIGUSR1 16)     ;; user defined signal 1
-  (defconstant  SIGUSR2 17)     ;; user defined signal 2
-  )
-
-#+:RIOS
-(progn 
-  (defconstant  SIGUSR1 30)     ;; user defined signal 1
-  (defconstant  SIGUSR2 31)     ;; user defined signal 2
-  )
-
-#+:IBMPS2
-(progn
-  (defconstant  SIGUSR1 30)     ;; user defined signal 1
-  (defconstant  SIGUSR2 31)     ;; user defined signal 2
-  )
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index 41759124..ee9a1801 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -634,3 +634,32 @@ $quitTag ==
 )else
   GENSYM()
 )endif
+
+--% Constants for OpenAxiom IPC
+--??? These constants should ideally be coming from a single
+--??? source used by both the C and the Lisp world.
+$SessionManager == 1
+$ViewportServer == 2
+$MenuServer == 3
+$SessionIO == 4
+$MessageServer == 5
+$InterpWindow == 6
+$KillSpad == 7
+$DebugWindow == 8
+$Forker == 9
+
+$CreateFrame == 1
+$SwitchFrames == 2
+$EndOfOutput == 3
+$CallInterp == 4
+$EndSession == 5
+$LispCommand == 6
+$SpadCommand == 7
+$SendXEventToHyperTeX == 8
+$QuietSpadCommand == 9
+$CloseClient == 10
+$QueryClients == 11
+$QuerySpad == 12
+$NonSmanSession == 13
+$KillLispSystem == 14
+
diff --git a/src/interp/sys-os.boot b/src/interp/sys-os.boot
index 1b60ac6d..827ae5b3 100644
--- a/src/interp/sys-os.boot
+++ b/src/interp/sys-os.boot
@@ -41,7 +41,6 @@
 module sys_-os
 import types
 import cfuns
-import sockio
 )package "BOOT"
 
 )if not %hasFeature KEYWORD::GCL