summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-05 15:32:28 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-05 15:32:28 +0000
commit6e4cfd9475e4287df2e9cd5bfdad6bd82aaaacd6 (patch)
tree8961babcfccde9a7dba1b3451e218afbd67756f2
parentdcd8cdbf113c0b0b2ffe1b2f6463e6f8fcb145aa (diff)
* win32/win32.c (NET_LUID): define it on MinGW32.
mingw-w64 has NET_LUID but mingw32 (mingw.org) still doesn't have NET_LUID. reported by taco on IRC git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/win32.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6700e1f6f0d..e85b40b4d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 6 00:30:04 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * win32/win32.c (NET_LUID): define it on MinGW32.
+ mingw-w64 has NET_LUID but mingw32 (mingw.org) still doesn't have
+ NET_LUID. reported by taco on IRC
+
Thu Jun 6 00:05:08 2013 Akinori MUSHA <knu@iDaemons.org>
* string.c (String#b): Allow code range scan to happen later so
diff --git a/win32/win32.c b/win32/win32.c
index b7eb4c62f2a..25d94ff429c 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3763,7 +3763,7 @@ str2guid(const char *str, GUID *guid)
}
/* License: Ruby's */
-#if !defined(_IFDEF_) && !defined(__MINGW32__)
+#if !defined(_IFDEF_) && !defined(__MINGW64__)
typedef struct {
uint64_t Value;
struct {