diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2017-04-13 16:05:54 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-09-09 16:32:29 +0900 |
| commit | 440876c629651d32c12551abb0f157aebe996546 (patch) | |
| tree | aeb6efc1eacd01f94d0bfd7d79b22cad0e882fcf | |
| parent | 2d9509646b83ffd980a8fadfbc986b6b47b38f37 (diff) | |
| download | ruby-440876c629651d32c12551abb0f157aebe996546.tar.gz | |
configure.in: don't check whether string literal concatenation works
It's part of C89.
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | strftime.c | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/configure.in b/configure.in index 8bad2b7977..c6917e7977 100644 --- a/configure.in +++ b/configure.in @@ -1810,20 +1810,6 @@ AS_IF([test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"] AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1) ]) -AC_CACHE_CHECK([string literal concatenation], - rb_cv_string_literal_concatenation, [ - AC_COMPILE_IFELSE([ - AC_LANG_BOOL_COMPILE_TRY([ -const char concatenated_literal[[]] = "literals" "to" - "be" "concatenated."; -], [sizeof(concatenated_literal) == 26])], - [rb_cv_string_literal_concatenation=yes], - [rb_cv_string_literal_concatenation=no])] -) -AS_IF([test "$rb_cv_string_literal_concatenation" = no], [ - AC_DEFINE(NO_STRING_LITERAL_CONCATENATION,1) -]) - AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg, [AC_TRY_COMPILE([ #include <stdarg.h> diff --git a/strftime.c b/strftime.c index ebb587c379..8dc958b99c 100644 --- a/strftime.c +++ b/strftime.c @@ -144,10 +144,6 @@ max(int a, int b) return (a > b ? a : b); } -#ifdef NO_STRING_LITERAL_CONCATENATION -#error No string literal concatenation -#endif - #define add(x,y) (rb_funcall((x), '+', 1, (y))) #define sub(x,y) (rb_funcall((x), '-', 1, (y))) #define mul(x,y) (rb_funcall((x), '*', 1, (y))) |