Skip to content

if_python/if_ruby header workaround is not needed #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
splhack merged 1 commit into from
Dec 7, 2017
Merged

if_python/if_ruby header workaround is not needed #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/if_python.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 2 additions & 11 deletions src/if_ruby.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down