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

ruby-changes:48889

From: usa <ko1@a...>
Date: Mon, 4 Dec 2017 15:41:32 +0900 (JST)
Subject: [ruby-changes:48889] usa:r61007 (trunk): try to pass compiling with VC12

usa	2017-12-04 15:41:28 +0900 (Mon, 04 Dec 2017)

  New Revision: 61007

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

  Log:
    try to pass compiling with VC12
    
    * win32/win32.c (FILE_ID_128): it's not defined in SDK with VC10, but seems to
      be defined in SDK with VC12.

  Modified files:
    trunk/win32/win32.c
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 61006)
+++ win32/win32.c	(revision 61007)
@@ -7895,12 +7895,14 @@ rb_w32_pow(double x, double y) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L7895
 }
 #endif
 
-#if !defined(_WIN32_WINNT_WIN8) || _WIN32_WINNT < 0x602
-#define FileIdInfo 0x12
-
+#ifndef FILE_INVALID_FILE_ID
 typedef struct {
     BYTE  Identifier[16];
 } FILE_ID_128;
+#endif
+
+#if !defined(_WIN32_WINNT_WIN8) || _WIN32_WINNT < 0x602
+#define FileIdInfo 0x12
 
 typedef struct {
     unsigned LONG_LONG VolumeSerialNumber;

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

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