* bignum.c (ones): Use __builtin_popcountl if available.

* internal.h (GCC_VERSION_SINCE): Macro moved from pack.c.

* pack.c: Include internal.h for GCC_VERSION_SINCE.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 6 deletions

diff --git a/pack.c b/pack.c
index 7a12cfcf24..fb6472c809 100644
--- a/pack.c
+++ b/pack.c
@@ -11,16 +11,11 @@
 
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
+#include "internal.h"
 #include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
 
-#define GCC_VERSION_SINCE(major, minor, patchlevel) \
-  (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
-   ((__GNUC__ > (major)) ||  \
-    (__GNUC__ == (major) && __GNUC_MINOR__ > (minor)) || \
-    (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))
-
 /*
  * It is intentional that the condition for natstr is HAVE_TRUE_LONG_LONG
  * instead of HAVE_LONG_LONG or LONG_LONG.