[前][次][番号順一覧][スレッド一覧]

ruby-changes:42916

From: nobu <ko1@a...>
Date: Fri, 13 May 2016 08:36:01 +0900 (JST)
Subject: [ruby-changes:42916] nobu:r54990 (trunk): defines.h: avoid redefinition

nobu	2016-05-13 08:35:20 +0900 (Fri, 13 May 2016)

  New Revision: 54990

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54990

  Log:
    defines.h: avoid redefinition
    
    * include/ruby/defines.h (GCC_VERSION_SINCE): get rid of
      re-definition.

  Modified files:
    trunk/include/ruby/defines.h
Index: include/ruby/defines.h
===================================================================
--- include/ruby/defines.h	(revision 54989)
+++ include/ruby/defines.h	(revision 54990)
@@ -46,12 +46,14 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/include/ruby/defines.h#L46
 # define NOINLINE(x) x
 #endif
 
+#ifndef GCC_VERSION_SINCE
 #define GCC_VERSION_SINCE(major, minor, patchlevel) \
   (defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__) && \
    ((__GNUC__ > (major)) ||  \
     ((__GNUC__ == (major) && \
       (__GNUC_MINOR__ > (minor)) || \
       (__GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))))
+#endif
 
 /* likely */
 #if __GNUC__ >= 3

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]