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, 1 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index 34734e63c37..2e4ee64f390 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -5849,6 +5849,7 @@ android_get_surrounding_text (void *data)
 {
   struct android_get_surrounding_text_context *request;
   struct frame *f;
+  ptrdiff_t temp;
 
   request = data;
 
@@ -5869,7 +5870,11 @@ android_get_surrounding_text (void *data)
      bad input methods.  */
 
   if (request->end < request->start)
-    swap (request->start, request->end);
+    {
+      temp = request->start;
+      request->start = request->end;
+      request->end = temp;
+    }
 
   /* Retrieve the conversion region.  */