Avoid SBCL deprecated features.

5 files changed, 17 insertions, 83 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9539d349..36ecb376 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-08-16  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* lisp/core.lisp.in (coreQuit) [SBCL]: Use sb-ext:exit since
+	sb-ext:quit is deprecated.
+	* clef/edible.c (flip_canonical): Remove as unused.
+	(flip_raw): Likewise.
+	(check_flip): Likewise.
+	* include/open-axiom.h: Unceremonially #include <stdint.h>.
+	* sman/sman.c (clean_up_terminal): Remove as unused.
+
 2014-02-03  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* boot/Makefile.in: Fix global variable names.
diff --git a/src/clef/edible.c b/src/clef/edible.c
index 71900805..7a6c4826 100644
--- a/src/clef/edible.c
+++ b/src/clef/edible.c
@@ -1,7 +1,7 @@
 /*
     Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
     All rights reserved.
-    Copyright (C) 2007-2010, Gabriel Dos Reis.
+    Copyright (C) 2007-2014, Gabriel Dos Reis.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -73,8 +73,6 @@ static void check_flip(void);
 static void catch_signals(void);
 static void init_parent(void);
 static void set_function_chars(void);
-static void flip_canonical(int );
-static void flip_raw(int );
 
 
 #ifdef siglog
@@ -286,7 +284,6 @@ main(int argc, char *argv[])
     code = select(FD_SETSIZE, &rfds, NULL, NULL, NULL);
     for(; code < 0 ;) {
       if(errno == EINTR) {
-        check_flip();
         code = select(FD_SETSIZE, &rfds, NULL, NULL, NULL);
       }
       else  {
@@ -322,7 +319,6 @@ main(int argc, char *argv[])
         write(logfd, "IN<<<<<", strlen("IN<<<<<"));
         write(logfd, in_buff, num_read);
 #endif
-        check_flip();
         if(MODE == CLEFRAW ) 
           write(contNum, in_buff, num_read);
         else 
@@ -504,67 +500,6 @@ catch_signals(void)
   alarm(60);
 }
 
-/* Here is where I check the child's termio settings, and try to copy them.
-   I simply trace through the main modes (CLEFRAW,  CLEFCANONICAL) and
-   try to simulate them */
-static void 
-check_flip(void)
-{
-  return;
-  
-#if 0
-  /*simply checks the termio structure of the child */
-  
-  if(tcgetattr(contNum, &childbuf) == -1) {
-    perror("clef parent getting child's terminal in check_termio");
-  }
-  if(childbuf.c_lflag & ICANON) {
-    if(MODE != CLEFCANONICAL) {
-      flip_canonical(contNum);
-      MODE = CLEFCANONICAL;
-    }
-  }
-  else {
-    if(MODE != CLEFRAW) {
-      flip_raw(contNum);
-      MODE = CLEFRAW;
-    }
-  }
-  /* While I am here, lets set the echo */
-  if(childbuf.c_lflag & ECHO) ECHOIT = 1;
-  else ECHOIT = 0;
-#endif
-}
-
-
-
-static void
-flip_raw(int chann)
-{
-  
-  if(MODE == CLEFCANONICAL) 
-    send_buff_to_child(chann);
-  
-  if(tcsetattr(0, TCSAFLUSH, &rawbuf) == -1) {
-    perror("clef resetting parent to raw ");
-    exit(-1);
-  }
-}
-
-
-static void
-flip_canonical(int chann)
-{
-  if(tcsetattr(0, TCSAFLUSH, &canonbuf) == -1) {
-    perror("clef resetting parent to canonical ");
-    exit(-1);
-  }
-  if(INS_MODE) 
-    Cursor_shape(5);
-  else 
-    Cursor_shape(2);
-}
-
 #define etc_whitespace(c) ((c == ' ' || c == '\t')?(1):(0))
 
 
diff --git a/src/include/open-axiom.h b/src/include/open-axiom.h
index 925ddc9a..7d15e4ec 100644
--- a/src/include/open-axiom.h
+++ b/src/include/open-axiom.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2013, Gabriel Dos Reis.
+  Copyright (C) 2007-2014, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -63,11 +63,7 @@
 
 #define OPENAXIOM_C_EXPORT OPENAXIOM_C_CALL OPENAXIOM_EXPORT
 
-#if defined(HAVE_STDINT_H)
-#  include <stdint.h>
-#elif defined (HAVE_INTTYPES_H)
-#  include <inttypes.h>
-#endif
+#include <stdint.h>
 
 #if defined(__WIN32__)
 #  include <windows.h>
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 921fe077..81fd0f2f 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -3,7 +3,7 @@
 ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 ;; All rights reserved.
 ;; 
-;; Copyright (C) 2007-2013, Gabriel Dos Reis.
+;; Copyright (C) 2007-2014, Gabriel Dos Reis.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
@@ -919,7 +919,7 @@
 ;; return to the calling shell.  When no exit status code is specified,
 ;; it would return $0$, meaning that everything is OK.
 (defun |coreQuit| (&optional (status 0))
-  #+:sbcl (sb-ext:quit :unix-status status)
+  #+:sbcl (sb-ext:exit :code status)
   #+:clisp (ext:quit status)
   #+:gcl (si::bye status)
   #+:ecl (ext:quit status)
diff --git a/src/sman/sman.c b/src/sman/sman.c
index c8c357f2..ac941266 100644
--- a/src/sman/sman.c
+++ b/src/sman/sman.c
@@ -1,7 +1,7 @@
 /*
   Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2013, Gabriel Dos Reis.
+  Copyright (C) 2007-2014, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -86,7 +86,6 @@ static void read_from_manager(int);
 static void manage_spad_io(int);
 static SpadProcess* find_child(int);
 static void kill_all_children(void);
-static void clean_up_terminal(void);
 static void monitor_children(void);
 
 /* System defined pointer to array or environment variables.  */
@@ -638,7 +637,7 @@ read_from_manager(int ptcNum)
 static void
 manage_spad_io(int ptcNum)
 {
-  int ret_code, i, p;
+  int ret_code, p;
   fd_set rd;
   while (1) {
     rd = socket_mask;
@@ -709,12 +708,6 @@ kill_all_children(void)
 }
 
 static void
-clean_up_terminal(void)
-{
-  tcsetattr(0, TCSAFLUSH, &oldbuf);
-}
-
-static void
 monitor_children(void)
 {
   int dead_baby, stat;