merge 3.5

This commit is contained in:
Benjamin Peterson 2016-09-05 17:22:22 -07:00
commit f3dd32950b

View file

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