ext/extconf.rb in proc-wait3-1.5.5 vs ext/extconf.rb in proc-wait3-1.5.6

@@ -2,36 +2,59 @@
 # Use the mkmf.rb file that I provide, so I can use the
 # have_enum_member method
 ########################################################
 require 'mkmf'
 
+# We need this for older versions of Ruby.
+def have_const(const, header = nil, opt = "", &b)
+   checking_for const do
+      header = cpp_include(header)
+      if try_compile(<<"SRC", opt, &b)
+#{COMMON_HEADERS}
+#{header}
+/* top */
+static int t = #{const};
+SRC
+         $defs.push(
+            format(
+               "-DHAVE_CONST_%s",
+               const.strip.upcase.tr_s("^A-Z0-9_", "_")
+            )
+         )
+         true
+      else
+         false
+      end
+   end
+end
+
 # Check to see if Ruby has already defined the various RLIMIT constants
 # and set an appropriate macro in the source.
 #
 begin
-   Process::RLIMIT_AS
+  Process::RLIMIT_AS
 rescue
-   check_sizeof('int')
-   check_sizeof('long')
-   check_sizeof('long long')
-   unless check_sizeof('rlim_t', 'sys/resource.h')
-      if (2**33).is_a?(Fixnum)
-         $defs.push('-DSIZEOF_RLIM_T 8') # 64 bit
-      else
-         $defs.push('-DSIZEOF_RLIM_T 4') # 32 bit
-      end
-   end
+  check_sizeof('int')
+  check_sizeof('long')
+  check_sizeof('long long')
+  unless check_sizeof('rlim_t', 'sys/resource.h')
+    if (2**33).is_a?(Fixnum)
+      $defs.push('-DSIZEOF_RLIM_T 8') # 64 bit
+    else
+      $defs.push('-DSIZEOF_RLIM_T 4') # 32 bit
+    end
+  end
 else
-   $defs.push('-DRUBY_HAS_RLIMIT') # Used within wait.c
+  $defs.push('-DRUBY_HAS_RLIMIT') # Used within wait.c
 end
 
 have_header('wait.h')
 
 # wait3 is mandatory.
 unless have_func('wait3')
-   STDERR.puts 'wait3() function not found'
-   exit
+  STDERR.puts 'wait3() function not found'
+  exit
 end
 
 # Yay, Linux
 have_func('str2sig')
 have_func('strlcpy')
@@ -41,78 +64,34 @@
 have_func('waitid')
 have_func('sigsend')
 have_func('getrusage')
 have_func('getdtablesize')
 
+have_struct_member('struct siginfo', 'si_fd', 'signal.h')
 have_struct_member('struct siginfo', 'si_trapno', 'signal.h')
 have_struct_member('struct siginfo', 'si_pc', 'signal.h')
 have_struct_member('struct siginfo', 'si_sysarg', 'signal.h')
 have_struct_member('struct siginfo', 'si_mstate', 'signal.h')
 have_struct_member('struct siginfo', 'si_faddr', 'signal.h')
 have_struct_member('struct siginfo', 'si_syscall', 'signal.h')
 have_struct_member('struct siginfo', 'si_nsysarg', 'signal.h')
 have_struct_member('struct siginfo', 'si_fault', 'signal.h')
 have_struct_member('struct siginfo', 'si_tstamp', 'signal.h')
+have_struct_member('struct siginfo', 'si_utime', 'signal.h')
+have_struct_member('struct siginfo', 'si_status', 'signal.h')
+have_struct_member('struct siginfo', 'si_stime', 'signal.h')
 
-count = 0
+have_const('P_CID', 'signal.h')
+have_const('P_GID', 'signal.h')
+have_const('P_MYID', 'signal.h')
+have_const('P_SID', 'signal.h')
+have_const('P_UID', 'signal.h')
 
-# Attempt to append the necessary method to the user's mkmf.rb file, after
-# backing it up first.
-begin
-   have_const('P_CID', 'signal.h')
-   have_const('P_GID', 'signal.h')
-   have_const('P_MYID', 'signal.h')
-   have_const('P_SID', 'signal.h')
-   have_const('P_UID', 'signal.h')
+have_const('P_ALL', 'signal.h') || have_const('P_ALL', 'sys/wait.h')
+have_const('P_PGID', 'signal.h') || have_const('P_PGID', 'sys/wait.h')
+have_const('P_PID', 'signal.h') || have_const('P_PID', 'sys/wait.h')
 
-   have_const('P_ALL', 'signal.h') || have_const('P_ALL', 'sys/wait.h')
-   have_const('P_PGID', 'signal.h') || have_const('P_PGID', 'sys/wait.h')
-   have_const('P_PID', 'signal.h') || have_const('P_PID', 'sys/wait.h')
-
-   # These are only supported by Solaris 8 and later afaik
-   have_const('P_PROJID', 'signal.h')
-   have_const('P_TASKID', 'signal.h')
-rescue NoMethodError
-   require 'rbconfig'
-   count += 1
-   file = File.join(Config::CONFIG['rubylibdir'], 'mkmf.rb')
-   FileUtils.cp(file, 'mkmf.orig') # Backup original
-   File.open(file, 'a+'){ |fh|
-      fh.puts %Q{
-# Returns whether or not the constant +const+ can be found in the common
-# header files, or within a +header+ that you provide. If found, a macro is
-# passed as a preprocessor constant to the compiler using the constant name,
-# in uppercase, prepended with 'HAVE_'. This method is also used to test
-# for the presence of enum values.
-# 
-# For example, if have_const('FOO') returned true, then the HAVE_CONST_FOO
-# preprocessor macro would be passed to the compiler.
-#
-# This method was added automatically by the proc-wait3 library on
-# #{Time.now}.
-#
-def have_const(const, header = nil, opt = "", &b)
-   checking_for const do
-      header = cpp_include(header)
-      if try_compile(<<"SRC", opt, &b)
-#\{COMMON_HEADERS\}
-#\{header\}
-/* top */
-static int t = #\{const\};
-SRC
-         $defs.push(
-            format(
-               "-DHAVE_CONST_%s",
-               const.strip.upcase.tr_s("^A-Z0-9_", "_")
-            )
-         )
-         true
-      else
-         false
-      end
-   end
-end}
-   }
-   retry unless count >= 2
-end
+# These are only supported by Solaris 8 and later afaik
+have_const('P_PROJID', 'signal.h')
+have_const('P_TASKID', 'signal.h')
 
 create_makefile('proc/wait3', 'proc')