Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 21:32:29 +0000 (23:32 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 21:32:29 +0000 (23:32 +0200)
commitdcc540db6ee0f41edd09b40d9854fb1a6509eab3
treecd0b35444b394e09211345c8b5b5562d22c15dbd
parent27e61a716c893a6ae67ca8f859c735bc0b0b799a
parent342b0ba5f93b09b1d0c2597db44605300e6fcc53
Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'

* commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53':
  configure: Only redirect strtoll to _strtoi64 if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
configure