nobu	2018-02-09 00:22:54 +0900 (Fri, 09 Feb 2018)

  New Revision: 62321

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

  Log:
    Fix compile error when USE_COPY_FILE_RANGE is defined but not USE_SENDFILE
    
    io.c: Variable and label definition are necessary in both cases.
    
    From: Lars Kanis <lars@g...>

  Modified files:
    trunk/io.c
Index: io.c
===================================================================
--- io.c	(revision 62320)
+++ io.c	(revision 62321)
@@ -11133,7 +11133,7 @@ static void * https://github.com/ruby/ruby/blob/trunk/io.c#L11133
 nogvl_copy_stream_func(void *arg)
 {
     struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-#ifdef USE_SENDFILE
+#if defined(USE_SENDFILE) || defined(USE_COPY_FILE_RANGE)
     int ret;
 #endif
 
@@ -11151,7 +11151,7 @@ nogvl_copy_stream_func(void *arg) https://github.com/ruby/ruby/blob/trunk/io.c#L11151
 
     nogvl_copy_stream_read_write(stp);
 
-#ifdef USE_SENDFILE
+#if defined(USE_SENDFILE) || defined(USE_COPY_FILE_RANGE)
   finish:
 #endif
     return 0;

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