Revert "Add new `swap` macro and use it"

typeof is an extension which does not exist in Standard C, so macros
using it are unsuitable for inclusion in Emacs.

This reverts commit 37889523278fe65733938fb11c3701898309961c.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 14c67224551..352aca8ddfd 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3591,7 +3591,10 @@ for the rear of the overlay advance when text is inserted there
   CHECK_FIXNUM_COERCE_MARKER (end);
 
   if (XFIXNUM (beg) > XFIXNUM (end))
-    swap (beg, end);
+    {
+      Lisp_Object temp;
+      temp = beg; beg = end; end = temp;
+    }
 
   ptrdiff_t obeg = clip_to_bounds (BUF_BEG (b), XFIXNUM (beg), BUF_Z (b));
   ptrdiff_t oend = clip_to_bounds (obeg, XFIXNUM (end), BUF_Z (b));
@@ -3611,7 +3614,11 @@ static void
 modify_overlay (struct buffer *buf, ptrdiff_t start, ptrdiff_t end)
 {
   if (start > end)
-    swap (start, end);
+    {
+      ptrdiff_t temp = start;
+      start = end;
+      end = temp;
+    }
 
   BUF_COMPUTE_UNCHANGED (buf, start, end);
 
@@ -3651,7 +3658,10 @@ buffer.  */)
   CHECK_FIXNUM_COERCE_MARKER (end);
 
   if (XFIXNUM (beg) > XFIXNUM (end))
-    swap (beg, end);
+    {
+      Lisp_Object temp;
+      temp = beg; beg = end; end = temp;
+    }
 
   specbind (Qinhibit_quit, Qt); /* FIXME: Why?  */