nobu	2012-01-17 12:32:50 +0900 (Tue, 17 Jan 2012)

  New Revision: 34323

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34323

  Log:
    * gc.c (aligned_malloc, aligned_free): covered missing defined
      operators and fixes for cygwin.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34322)
+++ ChangeLog	(revision 34323)
@@ -1,3 +1,8 @@
+Tue Jan 17 12:32:46 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (aligned_malloc, aligned_free): covered missing defined
+	  operators and fixes for cygwin.
+
 Tue Jan 17 10:54:46 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* st.c (do_hash): it's the time to remove cast to unsigned int.
Index: gc.c
===================================================================
--- gc.c	(revision 34322)
+++ gc.c	(revision 34323)
@@ -1088,9 +1088,9 @@
 {
     void *res;
 
-#if __MINGW32__
+#if defined __MINGW32__
     res = __mingw_aligned_malloc(size, alignment);
-#elif _WIN32 || defined __CYGWIN__
+#elif defined _WIN32 && !defined __CYGWIN__
     res = _aligned_malloc(size, alignment);
 #elif defined(HAVE_POSIX_MEMALIGN)
     if (posix_memalign(&res, alignment, size) == 0) {
@@ -1109,9 +1109,9 @@
 static void
 aligned_free(void *ptr)
 {
-#if __MINGW32__
+#if defined __MINGW32__
     __mingw_aligned_free(ptr);
-#elif _WIN32 || defined __CYGWIN__
+#elif defined _WIN32 && !defined __CYGWIN__
     _aligned_free(ptr);
 #else
     free(ptr);

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