From 1f250eaea359f7687812356217ed0e9e0f4e7484 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Fri, 14 Apr 2017 10:10:15 +0900
Subject: configure.in: don't check whether ## preprocessor operator works

This is part of C89.
---
 configure.in        | 11 -----------
 include/ruby/ruby.h |  1 +
 win32/Makefile.sub  |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/configure.in b/configure.in
index b40b816c44..4bbc639c2e 100644
--- a/configure.in
+++ b/configure.in
@@ -1769,17 +1769,6 @@ RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [
 RUBY_REPLACE_TYPE(off_t, [], OFFT)
 RUBY_REPLACE_TYPE(clockid_t, [], CLOCKID)
 
-AC_CACHE_CHECK(token paste string, rb_cv_tokenpaste,
-  [AC_TRY_COMPILE([@%:@define paste(a,b) a@%:@@%:@b],
-		  [int xy = 1; return paste(x,y);],
-		  rb_cv_tokenpaste=ansi,
-		  rb_cv_tokenpaste=knr)])
-AS_IF([test "$rb_cv_tokenpaste" = ansi], [
-  AC_DEFINE(TOKEN_PASTE(x,y),[x@%:@@%:@y])
-], [
-  AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
-])
-
 AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
   [AC_TRY_COMPILE([
 int foo(int x, ...);
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index ff1c463a29..099bbd31d3 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -46,6 +46,7 @@ extern "C" {
 # define UNREACHABLE ((void)0)	/* unreachable */
 #endif
 
+#define TOKEN_PASTE(x, y) x##y
 #define RUBY_MACRO_SELECT(base, n) TOKEN_PASTE(base, n)
 
 #ifdef HAVE_INTRINSICS_H
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 61f6aca8fb..8ea37a6615 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -604,7 +604,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 !if $(MSC_VER) < 1400
 #define SIZE_MAX UINT_MAX
 !endif
-#define TOKEN_PASTE(x,y) x##y
 !if $(MSC_VER) > 1100
 #define NORETURN(x) __declspec(noreturn) x
 !endif
-- 
cgit v1.2.3