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, 6 insertions, 3 deletions

diff --git a/src/eval.c b/src/eval.c
index 6a866d6cc32..94f6d8e31f8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2794,9 +2794,12 @@ usage: (run-hook-with-args-until-failure HOOK &rest ARGS)  */)
 static Lisp_Object
 run_hook_wrapped_funcall (ptrdiff_t nargs, Lisp_Object *args)
 {
-  swap (args[0], args[1]);
-  Lisp_Object ret = Ffuncall (nargs, args);
-  swap (args[1], args[0]);
+  Lisp_Object tmp = args[0], ret;
+  args[0] = args[1];
+  args[1] = tmp;
+  ret = Ffuncall (nargs, args);
+  args[1] = args[0];
+  args[0] = tmp;
   return ret;
 }