From 7d672f3e3733683e41b7137a8fa488340033ce0c Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 27 Mar 2013 22:13:06 +0000 Subject: * include/ruby/intern.h: Delete redundant inclusions caused by AC_INCLUDES_DEFAULT in defines.h. * include/ruby/defines.h: Ditto. * include/ruby/ruby.h: Ditto. * include/ruby/st.h: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/defines.h | 4 ---- include/ruby/intern.h | 4 ---- include/ruby/ruby.h | 18 ++---------------- include/ruby/st.h | 13 ------------- 4 files changed, 2 insertions(+), 37 deletions(-) (limited to 'include/ruby') diff --git a/include/ruby/defines.h b/include/ruby/defines.h index 131b2222fc..c741b0ec28 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -59,10 +59,6 @@ extern "C" { #define RUBY -# include -#ifdef HAVE_STDLIB_H -# include -#endif #ifdef __cplusplus # ifndef HAVE_PROTOTYPES # define HAVE_PROTOTYPES 1 diff --git a/include/ruby/intern.h b/include/ruby/intern.h index ae265ec3c0..de430a9eaf 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -32,10 +32,6 @@ extern "C" { # include #endif -#if defined(HAVE_SYS_TYPES_H) -#include -#endif - #include "ruby/st.h" #if defined __GNUC__ && __GNUC__ >= 4 diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 14b67ea067..eba50ea114 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -26,6 +26,8 @@ extern "C" { #include RUBY_EXTCONF_H #endif +#include "defines.h" + #define NORETURN_STYLE_NEW 1 #ifndef NORETURN # define NORETURN(x) x @@ -47,27 +49,11 @@ extern "C" { #define PRINTF_ARGS(decl, string_index, first_to_check) decl #endif -#ifdef HAVE_STRING_H -# include -#else -# include -#endif - #ifdef HAVE_INTRINSICS_H # include #endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif - #include -#include - -#include "defines.h" #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility push(default) diff --git a/include/ruby/st.h b/include/ruby/st.h index c2294a92c1..466bbcf5f6 100644 --- a/include/ruby/st.h +++ b/include/ruby/st.h @@ -14,19 +14,6 @@ extern "C" { #include "ruby/defines.h" -#if defined STDC_HEADERS -#include -#elif defined HAVE_STDLIB_H -#include -#endif - -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif - #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility push(default) #endif -- cgit v1.2.3