ruby-changes:65853
From: Nobuyoshi <ko1@a...>
Date: Mon, 12 Apr 2021 22:49:30 +0900 (JST)
Subject: [ruby-changes:65853] df7efdcb6b (master): Get rid of LONG_LONG redefinition
https://git.ruby-lang.org/ruby.git/commit/?id=df7efdcb6b From df7efdcb6b7fd4286fe7d1fe853fb679aa6a5120 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Mon, 12 Apr 2021 22:47:07 +0900 Subject: Get rid of LONG_LONG redefinition --- string.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/string.c b/string.c index 90f6bca..80ea96f 100644 --- a/string.c +++ b/string.c @@ -21,15 +21,6 @@ https://github.com/ruby/ruby/blob/trunk/string.c#L21 # include <unistd.h> #endif -#if defined HAVE_CRYPT_R -# if defined HAVE_CRYPT_H -# include <crypt.h> -# endif -#elif !defined HAVE_CRYPT -# include "missing/crypt.h" -# define HAVE_CRYPT_R 1 -#endif - #include "debug_counter.h" #include "encindex.h" #include "gc.h" @@ -55,6 +46,15 @@ https://github.com/ruby/ruby/blob/trunk/string.c#L46 #include "ruby_assert.h" #include "vm_sync.h" +#if defined HAVE_CRYPT_R +# if defined HAVE_CRYPT_H +# include <crypt.h> +# endif +#elif !defined HAVE_CRYPT +# include "missing/crypt.h" +# define HAVE_CRYPT_R 1 +#endif + #define BEG(no) (regs->beg[(no)]) #define END(no) (regs->end[(no)]) -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/