thrift_protocol cannot compile in 7.0.7

When compile thrift_protocol extension with php7.0.7 in OS X 10.11,

Report error:

php_thrift_protocol7.cpp:290:27: error: no member named 'min' in namespace 'std'; did you mean 'fmin'?

and

zend_hash.h:168:30: note: candidate function not viable: no known conversion from 'unsigned long *' to 'zend_ulong *' (aka 'unsigned long long *') for 3rd argument
ZEND_API int ZEND_FASTCALL zend_hash_get_current_key_ex(const HashTable *ht, zend_string **str_index, zend_ulong *num_index, HashPosition *pos);

And I find someone in github solved this problom, but no one notice it, so I create this issue