Merge branch 'rj/compat-regex-size-max-fix' into maint
commitc0144452efbd4de667c26dacad7dfb9fbca99705
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:38 +0000 (6 13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:38 +0000 (6 13:06 -0700)
tree651c9adc3b63698a46167cd1ae254109c54072c8
parent8162401fb0ab16addc6e003a93b8d195cce3fad4
parentbd8f0055836e7f9c5010d5ed81d3b20a835e44c8
Merge branch 'rj/compat-regex-size-max-fix' into maint

A compilation fix.

* rj/compat-regex-size-max-fix:
  regex: fix a SIZE_MAX macro redefinition warning