Merge pull request #608 from macvim-dev/fix/if_python_ruby

if_python/if_ruby header workaround is not needed

Author: splhack

src/if_python.c

@@ -64,11 +64,7 @@
 
 #define PY_SSIZE_T_CLEAN
 
-#ifdef FEAT_GUI_MACVIM
-# include <Python/Python.h>
-#else
-# include <Python.h>
-#endif
+#include <Python.h>
 
 #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
 # undef PY_SSIZE_T_CLEAN

src/if_ruby.c

@@ -117,18 +117,9 @@
 # define rb_gc_writebarrier_unprotect rb_gc_writebarrier_unprotect_stub
 #endif
 
-#ifdef FEAT_GUI_MACVIM
-# include <Ruby/ruby.h>
-#else
-# include <ruby.h>
-#endif
+#include <ruby.h>
 #ifdef RUBY19_OR_LATER
-# ifdef FEAT_GUI_MACVIM
-#  undef SIZEOF_TIME_T
-#  include <Ruby/ruby/encoding.h>
-# else
-#  include <ruby/encoding.h>
-# endif
+# include <ruby/encoding.h>
 #endif
 
 #undef off_t	/* ruby defines off_t as _int64, Mingw uses long */