merge 3.5

This commit is contained in:
Benjamin Peterson 2016-09-05 16:27:08 -07:00
commit 63604032af

View file

@ -34,7 +34,6 @@ union value {
#ifdef HAVE_LONG_LONG
PY_LONG_LONG ll;
#endif
long double D;
};
/*
@ -306,7 +305,6 @@ struct tagPyCArgObject {
#ifdef HAVE_LONG_LONG
PY_LONG_LONG q;
#endif
long double D;
double d;
float f;
void *p;