Merge branch 'rj/compat-regex-size-max-fix'
commit2380db5b28aff110cd8f6ef2bb65dd5ab49303b2
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:47 +0000 (27 09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:47 +0000 (27 09:56 -0700)
tree843f9228ca38d314c06cdc075f8e18893800ee13
parentbe099661f41e661eac8af2b4879a84a9eb9a7b9b
parentbd8f0055836e7f9c5010d5ed81d3b20a835e44c8
Merge branch 'rj/compat-regex-size-max-fix'

A compilation fix.

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