* lib/Makefile.in: Build libopen-axiom-core and libspad with a C++

	compiler and linker.
	* lib/bsdsignal.c: Fix C calling convention annotation.
	* lib/cfuns-c.c: Likewise.
	* lib/edin.c: Likewise.
	* lib/sockio-c.c: Likewise.
	* include/bsdsignal.h: Remove 'extern "C"'-block annotation.
	* include/cfuns.h: Likewise.
	* include/cursor.h: Likewise.
	* include/edin.h: Likewise.
	* include/fnct_key.h: Likewise.
	* include/halloc.h: Likewise.
	* include/hash.h: Likewise.
	* include/openpty.h: Likewise.
	* include/pixmap.h: Likewise.
	* include/prt.h: Likewise.
	* include/sockio.h: Likewise.
	* include/spadcolors.h: Likewise.
	* include/util.H1: Likewise.
	* include/view.h: Likewise.
	* include/wct.h: Likewise.
	* include/open-axiom.h (OPENAXIOM_C_CALL): New macro.
	(OPENAXIOM_C_EXPORT): Likewise.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/edin.c b/src/lib/edin.c
index 508c701a..c93e2876 100644
--- a/src/lib/edin.c
+++ b/src/lib/edin.c
@@ -811,7 +811,7 @@ void
 insert_queue(void)
 {
   QueStruct *trace;
-  QueStruct *new;
+  QueStruct *new_q;
   int c;
   
   if (!ECHOIT)
@@ -840,21 +840,21 @@ insert_queue(void)
    * simply places the buff command into the front of the queue
    */
   if (ring_size < MAXRING) {
-    new = (QueStruct *) malloc(sizeof(struct que_struct));
-    if (new == NULL) {
+    new_q = (QueStruct *) malloc(sizeof(struct que_struct));
+    if (new_q == NULL) {
       fprintf(stderr, "Malloc Error: Ran out of memory\n");
       exit(-1);
     }
     if (ring_size == 0) {
-      ring = new;
-      ring->prev = ring->next = new;
+      ring = new_q;
+      ring->prev = ring->next = new_q;
     }
     else {
-      new->next = ring->next;
-      new->prev = ring;
-      ring->next = new;
-      new->next->prev = new;
-      ring = new;
+      new_q->next = ring->next;
+      new_q->prev = ring;
+      ring->next = new_q;
+      new_q->next->prev = new_q;
+      ring = new_q;
     }
     ring_size++;
   }