summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-14 03:22:06 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-14 03:22:06 +0000
commit77753bd9ec9f40e49d7bed633778f365e96a102a (patch)
treee2579db316a34561538d24af6d80a2ea9431f1aa
parentbb5212d395ae2a65f40ee1a17c8eaa56ccb38c95 (diff)
* win32/win32.c (NET_LUID): mingw may have NET_LUID and not defined
_IFDEF_. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf9701c7d4..588cd47da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 14 12:21:28 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (NET_LUID): mingw may have NET_LUID and not defined
+ _IFDEF_.
+
Tue May 14 03:33:17 2013 Koichi Sasada <ko1@atdot.net>
* string.c (rb_str_new_frozen): remove debug print.
diff --git a/win32/win32.c b/win32/win32.c
index 2489942e4d..63453c349e 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3762,7 +3762,7 @@ str2guid(const char *str, GUID *guid)
}
/* License: Ruby's */
-#ifndef _IFDEF_
+#if !defined(_IFDEF_) && !defined(__MINGW32__)
typedef struct {
uint64_t Value;
struct {