* configure.ac.pamphlet: Check from uint8_t.

* config/openaxiom-c-macros.h.in: Rename from config/axiom-c-macros.h.in. * src: Propagate change.
author: dos-reis <gdr@axiomatics.org> 2008-04-28 02:13:31 +0000
committer: dos-reis <gdr@axiomatics.org> 2008-04-28 02:13:31 +0000
commit: 3223409ab97b1a6a8e60d541b0c7b5b69c8b9a83 (patch)
tree: 5c7ffe18c0f939cfcc57bfe33f999815d6c3a317 /src/hyper
parent: 97b5280bd5ff44b94213559391421ba39e11249a (diff)
download: open-axiom-3223409ab97b1a6a8e60d541b0c7b5b69c8b9a83.tar.gz
36 files changed, 39 insertions, 44 deletions
diff --git a/src/hyper/ReadBitmap.c b/src/hyper/ReadBitmap.c
index 578c8e3c..845e9e9d 100644
--- a/src/hyper/ReadBitmap.c
+++ b/src/hyper/ReadBitmap.c
@@ -35,7 +35,7 @@
 
 #define _READBITMAP_C
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
diff --git a/src/hyper/cond.c b/src/hyper/cond.c
index d60e7a82..b0a72229 100644
--- a/src/hyper/cond.c
+++ b/src/hyper/cond.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _COND_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/debug.c b/src/hyper/debug.c
index 2b0d1836..7260ca15 100644
--- a/src/hyper/debug.c
+++ b/src/hyper/debug.c
@@ -34,7 +34,7 @@
 */
 
 #define  _DEBUG_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/dialog.c b/src/hyper/dialog.c
index a65b3ae8..61cdda70 100644
--- a/src/hyper/dialog.c
+++ b/src/hyper/dialog.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _DIALOG_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/display.c b/src/hyper/display.c
index 7e9d364a..4271e81e 100644
--- a/src/hyper/display.c
+++ b/src/hyper/display.c
@@ -52,7 +52,7 @@
  */
 
 #define _DISPLAY_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
diff --git a/src/hyper/event.c b/src/hyper/event.c
index b7dfe6b1..10930dc7 100644
--- a/src/hyper/event.c
+++ b/src/hyper/event.c
@@ -34,7 +34,7 @@
 */
 
 #define _EVENT_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/ex2ht.c b/src/hyper/ex2ht.c
index 0d21673e..de6afe03 100644
--- a/src/hyper/ex2ht.c
+++ b/src/hyper/ex2ht.c
@@ -37,7 +37,7 @@
 
 
 #define _EX2HT_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include <stdio.h>
diff --git a/src/hyper/extent.h b/src/hyper/extent.h
index cebf6049..5ef24361 100644
--- a/src/hyper/extent.h
+++ b/src/hyper/extent.h
@@ -36,7 +36,7 @@
 #ifndef _EXTENT_H_
 #define _EXTENT_H_ 1
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #include "hyper.h"
 
 /*
diff --git a/src/hyper/extent1.c b/src/hyper/extent1.c
index 2c89944e..3ae2aaf5 100644
--- a/src/hyper/extent1.c
+++ b/src/hyper/extent1.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _EXTENT1_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/extent2.c b/src/hyper/extent2.c
index 40ed44a6..84b11bc9 100644
--- a/src/hyper/extent2.c
+++ b/src/hyper/extent2.c
@@ -42,7 +42,7 @@
  ****************************************************************************/
 
 #define _EXTENT2_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/form-ext.c b/src/hyper/form-ext.c
index db817355..edfffe9f 100644
--- a/src/hyper/form-ext.c
+++ b/src/hyper/form-ext.c
@@ -34,7 +34,7 @@
 */
 
 #define _FORM_EXT_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/group.h b/src/hyper/group.h
index ce2ee5dd..4bf52264 100644
--- a/src/hyper/group.h
+++ b/src/hyper/group.h
@@ -36,7 +36,7 @@
 #ifndef _GROUP_H_
 #define _GROUP_H_ 1
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #include "hyper.h"
 
 extern GroupItem   *gTopOfGroupStack;
diff --git a/src/hyper/halloc.c b/src/hyper/halloc.c
index 0f66b292..1cccb324 100644
--- a/src/hyper/halloc.c
+++ b/src/hyper/halloc.c
@@ -34,7 +34,7 @@
 */
 
 #define _HALLOC_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include <stdio.h>
diff --git a/src/hyper/hash.c b/src/hyper/hash.c
index a9a6c00e..170f7d15 100644
--- a/src/hyper/hash.c
+++ b/src/hyper/hash.c
@@ -34,7 +34,7 @@
 */
 
 #define _HASH_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c
index 1b650c01..6eb71c5c 100644
--- a/src/hyper/htadd.c
+++ b/src/hyper/htadd.c
@@ -37,7 +37,7 @@
 
 
 #define _HTADD_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "sockio.h"
 #include "hyper.h"
diff --git a/src/hyper/hterror.c b/src/hyper/hterror.c
index 46852c46..ec5f8123 100644
--- a/src/hyper/hterror.c
+++ b/src/hyper/hterror.c
@@ -36,7 +36,7 @@
 #define _HTERROR_C
 #define HTERROR
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/hthits.c b/src/hyper/hthits.c
index b3e24774..ffaf2ad9 100644
--- a/src/hyper/hthits.c
+++ b/src/hyper/hthits.c
@@ -49,7 +49,7 @@
  * SMW Feb 91
  */
 #define _HTHITS_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c
index 2e43a6e4..113ea887 100644
--- a/src/hyper/htinp.c
+++ b/src/hyper/htinp.c
@@ -34,7 +34,7 @@
 */
 
 #define _HTINP_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/hyper.h b/src/hyper/hyper.h
index 48e142bc..48b8bbd1 100644
--- a/src/hyper/hyper.h
+++ b/src/hyper/hyper.h
@@ -36,7 +36,7 @@
 #ifndef _HYPER_H_
 #define _HYPER_H_ 1
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/hyper/initx.c b/src/hyper/initx.c
index 7565e54c..d2464652 100644
--- a/src/hyper/initx.c
+++ b/src/hyper/initx.c
@@ -44,7 +44,7 @@
 /* #define DEBUG  1 */
 
 #define _INITX_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
diff --git a/src/hyper/input.c b/src/hyper/input.c
index 36901184..c3a19958 100644
--- a/src/hyper/input.c
+++ b/src/hyper/input.c
@@ -34,7 +34,7 @@
 */
 
 #define _INPUT_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
diff --git a/src/hyper/item.c b/src/hyper/item.c
index 8ba00b43..3d900e04 100644
--- a/src/hyper/item.c
+++ b/src/hyper/item.c
@@ -33,7 +33,7 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #include "sockio.h"
 #define _ITEM_C
 #include "debug.h"
diff --git a/src/hyper/keyin.c b/src/hyper/keyin.c
index 27639c14..ec775ac7 100644
--- a/src/hyper/keyin.c
+++ b/src/hyper/keyin.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _KEYIN_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/lex.c b/src/hyper/lex.c
index 66cfdada..aaff7b3a 100644
--- a/src/hyper/lex.c
+++ b/src/hyper/lex.c
@@ -57,7 +57,7 @@
  *
  */
 #define _LEX_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
@@ -269,8 +269,6 @@ get_char(void)
     return c;
 }
 
-char * read_again = 0;
-
 /* return the next character in the input stream */
 static int
 get_char1(void)
@@ -313,7 +311,7 @@ AGAIN:
         }
         if (last_command == EndOfPage)
             return EOF;
-        if (read_again == NULL) {
+        if (spad_socket->nbytes_pending == 0) {
             last_command = cmd = get_int(spad_socket);
             if (cmd == EndOfPage)
                 return EOF;
@@ -322,7 +320,7 @@ AGAIN:
                 spad_error_handler();
 #endif
         }
-        read_again = get_string_buf(spad_socket, sock_buf, 1023);
+        get_string_buf(spad_socket, sock_buf, 1023);
         /* this will be null if this is the last time*/
         input_string = sock_buf;
         goto AGAIN;
@@ -825,7 +823,6 @@ spad_error_handler(void)
     exit(-1);
 }
 
-extern int still_reading, str_len;
 void
 reset_connection(void)
 {
@@ -837,9 +834,7 @@ reset_connection(void)
         spad_socket = NULL;
         if (input_string)
             input_string[0] = '\0';
-        read_again = 0;
-        str_len = 0;
-        still_reading = 0;
+        spad_socket->nbytes_pending = 0;
         connect_spad();
     }
 }
diff --git a/src/hyper/macro.c b/src/hyper/macro.c
index 7d681c78..917a6f83 100644
--- a/src/hyper/macro.c
+++ b/src/hyper/macro.c
@@ -34,7 +34,7 @@
 */
 
 #define _MACRO_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
diff --git a/src/hyper/parse-aux.c b/src/hyper/parse-aux.c
index b8938693..08995d49 100644
--- a/src/hyper/parse-aux.c
+++ b/src/hyper/parse-aux.c
@@ -33,7 +33,7 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #define _PARSE_AUX_C
 
 #include "debug.h"
diff --git a/src/hyper/parse-input.c b/src/hyper/parse-input.c
index 961fe623..7e5450c1 100644
--- a/src/hyper/parse-input.c
+++ b/src/hyper/parse-input.c
@@ -33,7 +33,7 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #define _PARSE_INPUT_C
 /***
   Contains all the code needed to parse input items,
diff --git a/src/hyper/parse-paste.c b/src/hyper/parse-paste.c
index 264c773b..d4b83fb8 100644
--- a/src/hyper/parse-paste.c
+++ b/src/hyper/parse-paste.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _PARSE_PASTE_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/parse-paste.h b/src/hyper/parse-paste.h
index ec550ff3..d730b9bd 100644
--- a/src/hyper/parse-paste.h
+++ b/src/hyper/parse-paste.h
@@ -36,7 +36,7 @@
 #ifndef _PARSE_PASTE_H_
 #define _PARSE_PASTE_H_ 1
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #include "hyper.h"
 
 extern short int gInPaste;
diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c
index 2e42a205..56cb418e 100644
--- a/src/hyper/parse-types.c
+++ b/src/hyper/parse-types.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _PARSE_TYPES_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
diff --git a/src/hyper/parse.h b/src/hyper/parse.h
index 6ea2e75d..698b0db0 100644
--- a/src/hyper/parse.h
+++ b/src/hyper/parse.h
@@ -36,7 +36,7 @@
 #ifndef _PARSE_H_
 #define _PARSE_H_ 1
 
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 #include "hterror.h"
 
 #ifdef SUNplatform
diff --git a/src/hyper/scrollbar.c b/src/hyper/scrollbar.c
index 56da0d98..0f96f573 100644
--- a/src/hyper/scrollbar.c
+++ b/src/hyper/scrollbar.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _SCROLLBAR_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 #include "sockio.h"
diff --git a/src/hyper/show-types.c b/src/hyper/show-types.c
index 0d355c38..d5cb7ab6 100644
--- a/src/hyper/show-types.c
+++ b/src/hyper/show-types.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _SHOW_TYPES_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c
index 5ff51315..dbe926ea 100644
--- a/src/hyper/spadbuf.c
+++ b/src/hyper/spadbuf.c
@@ -34,7 +34,7 @@
 */
 
 #define _SPADBUF_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c
index 842b4c4a..3e21deac 100644
--- a/src/hyper/spadint.c
+++ b/src/hyper/spadint.c
@@ -37,7 +37,7 @@
 
 /* Communication interface for external OpenAxiom buffers */
 #define _SPADINT_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
 
diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c
index e3ea0f56..7d925cb6 100644
--- a/src/hyper/titlebar.c
+++ b/src/hyper/titlebar.c
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 #define _TITLEBAR_C
-#include "axiom-c-macros.h"
+#include "openaxiom-c-macros.h"
 
 #include "debug.h"
author	dos-reis <gdr@axiomatics.org>	2008-04-28 02:13:31 +0000
committer	dos-reis <gdr@axiomatics.org>	2008-04-28 02:13:31 +0000
commit	3223409ab97b1a6a8e60d541b0c7b5b69c8b9a83 (patch)
tree	5c7ffe18c0f939cfcc57bfe33f999815d6c3a317 /src/hyper
parent	97b5280bd5ff44b94213559391421ba39e11249a (diff)
download	open-axiom-3223409ab97b1a6a8e60d541b0c7b5b69c8b9a83.tar.gz