From ebb99847285bca912e04f79dd3d9dcc84769ccf6 Mon Sep 17 00:00:00 2001
From: Barry O'Reilly
Date: Wed, 11 Sep 2013 01:03:23 -0400
Subject: Change comparison functions =, <, >, <=, >= to take many arguments. *
 src/data.c: Change comparison functions' interface and   implementation *
 src/lisp.h: Make arithcompare available for efficient two arg   comparisons *
 src/bytecode.c: Use arithcompare * src/fileio.c: Use new interface *
 test/automated/data-tests.el: New tests for comparison functions * etc/NEWS

---
 src/bytecode.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/bytecode.c')

diff --git a/src/bytecode.c b/src/bytecode.c
index e0e7b22ea13..3ac8b452fbe 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1367,7 +1367,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 	    Lisp_Object v1;
 	    BEFORE_POTENTIAL_GC ();
 	    v1 = POP;
-	    TOP = Fgtr (TOP, v1);
+	    TOP = arithcompare (TOP, v1, ARITH_GRTR);
 	    AFTER_POTENTIAL_GC ();
 	    NEXT;
 	  }
@@ -1377,7 +1377,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 	    Lisp_Object v1;
 	    BEFORE_POTENTIAL_GC ();
 	    v1 = POP;
-	    TOP = Flss (TOP, v1);
+	    TOP = arithcompare (TOP, v1, ARITH_LESS);
 	    AFTER_POTENTIAL_GC ();
 	    NEXT;
 	  }
@@ -1387,7 +1387,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 	    Lisp_Object v1;
 	    BEFORE_POTENTIAL_GC ();
 	    v1 = POP;
-	    TOP = Fleq (TOP, v1);
+	    TOP = arithcompare (TOP, v1, ARITH_LESS_OR_EQUAL);
 	    AFTER_POTENTIAL_GC ();
 	    NEXT;
 	  }
@@ -1397,7 +1397,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 	    Lisp_Object v1;
 	    BEFORE_POTENTIAL_GC ();
 	    v1 = POP;
-	    TOP = Fgeq (TOP, v1);
+	    TOP = arithcompare (TOP, v1, ARITH_GRTR_OR_EQUAL);
 	    AFTER_POTENTIAL_GC ();
 	    NEXT;
 	  }
-- 
cgit v1.2.1


From d6d9cbc15cbebfe466756a7a75601173c15287a2 Mon Sep 17 00:00:00 2001
From: Dmitry Antipov
Date: Tue, 24 Sep 2013 10:43:20 +0400
Subject: Use union for the payload of struct Lisp_Vector. This helps to avoid
 a few glitches dictated by C's aliasing rules. * lisp.h (struct Lisp_Vector):
 Use union for next and contents member.  Adjust comment.  Change related
 users. * alloc.c (next_in_free_list, set_next_in_free_list): Remove. Related
 users changed. * buffer.c, bytecode.c, ccl.c, character.h, chartab.c,
 composite.c: * composite.h, disptab.h, fns.c, fontset.c, indent.c,
 keyboard.c: * lread.c, msdos.c, process.c, w32menu.c, window.c, xdisp.c: *
 xfaces.c, xfont.c, xmenu.c: Related users changed.

---
 src/bytecode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bytecode.c')

diff --git a/src/bytecode.c b/src/bytecode.c
index 3ac8b452fbe..23e50826633 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -536,7 +536,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 #ifdef BYTE_CODE_SAFE
   bytestr_length = SBYTES (bytestr);
 #endif
-  vectorp = XVECTOR (vector)->contents;
+  vectorp = XVECTOR (vector)->u.contents;
 
   stack.byte_string = bytestr;
   stack.pc = stack.byte_string_start = SDATA (bytestr);
-- 
cgit v1.2.1