From bfa6fb6d12be8578775c7c00aa31937ba0ddc344 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Sun, 27 May 2001 06:19:21 +0000
Subject: [PATCH] * configure.in: Remove unused HAVE_PORTABLE_TOKEN_PASTING. *
 acconfig.h: Likewise. * src/layout.c: Likewise.

---
 ChangeLog    |  4 ++++
 acconfig.h   |  3 ---
 configure.in | 13 -------------
 src/layout.c | 10 ----------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6e8cb502..c91249bf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-05-27  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: Remove unused HAVE_PORTABLE_TOKEN_PASTING.
+	* acconfig.h: Likewise.
+	* src/layout.c: Likewise.
+
 	* Make.common.in: Remove all percent rules.
 	* acinclude.m4 (AC_PROG_GNU_MAKE): Remove.
 	* configure.in: Remove AC_PROG_GNU_MAKE. Don't substitute
diff --git a/acconfig.h b/acconfig.h
index 0cbe3ec4b..086ef24de 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -142,9 +142,6 @@
 /* Defined if you have the crypt prototype in neither unistd.h nor crypt.h */
 #undef NEED_CRYPT_PROTOTYPE
 
-/* Defined if your CPP understands ## macro token pasting method */
-#undef HAVE_PORTABLE_TOKEN_PASTING
-
 /* Define if your system has struct linger */
 #undef HAVE_STRUCT_LINGER
 
diff --git a/configure.in b/configure.in
index 795746b03..767b5a990 100644
--- a/configure.in
+++ b/configure.in
@@ -192,19 +192,6 @@ AC_CHECK_TYPE(nlink_t, unsigned int)
 AC_FUNC_MMAP
 AC_FUNC_ALLOCA
 
-dnl
-dnl Cool hack, but we don't use it currently 
-dnl
-dnl AC_MSG_CHECKING([for token pasting method])
-dnl AC_EGREP_CPP(portable,[
-dnl #define tken(a, b) a##b
-dnl tken(port, able)
-dnl ], [AC_DEFINE(HAVE_PORTABLE_TOKEN_PASTING)
-dnl AC_MSG_RESULT(portable)
-dnl ], [
-dnl AC_MSG_RESULT(non-portable)
-dnl ])
-
 AC_PATH_XTRA
 
 dnl
diff --git a/src/layout.c b/src/layout.c
index c8b9f5c5c..0f2e7132c 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -1068,16 +1068,6 @@ void swap_panels ()
     WPanel *panel1, *panel2;
     int tmp_type;
     
-#if 0
-#ifdef HAVE_PORTABLE_TOKEN_PASTING
-#define panelswap(e) panel.##e = panel1->##e; panel1->##e = panel2->##e; panel2->##e = panel.##e;
-#define panelswapstr(e) strcpy (panel.##e, panel1->##e); strcpy (panel1->##e, panel2->##e); strcpy (panel2->##e, panel.##e);
-#else
-#define panelswap(e) panel./**/e = panel1->/**/e; panel1->/**/e = panel2->/**/e; panel2->/**/e = panel./**/e;
-#define panelswapstr(e) strcpy (panel./**/e, panel1->/**/e); strcpy (panel1->/**/e, panel2->/**/e); strcpy (panel2->/**/e, panel./**/e);
-#endif
-#endif
-
 #define panelswap(x) panel. x = panel1-> x; panel1-> x = panel2-> x; panel2-> x = panel. x;
 
 #define panelswapstr(e) strcpy (panel. e, panel1-> e); \