diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-27 21:56:20 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-27 21:56:20 +0000 |
commit | 6537dc309962c7fefcb8d698bbebe4e4f78d0096 (patch) | |
tree | 80444727c5d9ffe0572372ef47a01fbafe9a4c03 | |
parent | cbdbc9107b59c435317b745434b849c0158a6d7f (diff) | |
download | ruby-6537dc309962c7fefcb8d698bbebe4e4f78d0096.tar.gz |
* include/ruby/defines.h: Fix a compilation error on NetBSD,
"type of formal parameter 1 is incomplete" for the rb_thread_wait_for
invocation in rb_file_flock, by including header files as
AC_INCLUDES_DEFAULT of autoconf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | include/ruby/defines.h | 35 |
2 files changed, 42 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Thu Mar 28 06:51:31 2013 Tanaka Akira <akr@fsij.org> + + * include/ruby/defines.h: Fix a compilation error on NetBSD, + "type of formal parameter 1 is incomplete" for the rb_thread_wait_for + invocation in rb_file_flock, by including header files as + AC_INCLUDES_DEFAULT of autoconf. + Wed Mar 27 22:09:14 2013 Tanaka Akira <akr@fsij.org> * numeric.c (LONG_MIN_MINUS_ONE_IS_LESS_THAN): New macro. diff --git a/include/ruby/defines.h b/include/ruby/defines.h index de0883d2c9..131b2222fc 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -22,6 +22,41 @@ extern "C" { #include RUBY_EXTCONF_H #endif +/* AC_INCLUDES_DEFAULT */ +#include <stdio.h> +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef STDC_HEADERS +# include <stdlib.h> +# include <stddef.h> +#else +# ifdef HAVE_STDLIB_H +# include <stdlib.h> +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include <memory.h> +# endif +# include <string.h> +#endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +#endif +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #define RUBY # include <stddef.h> |