Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the build on FreeBSD with Clang

Browse source 
NULL expands to nullptr which cannot be cast to an int.  Replace it with
0 in wcsfilecmp.

Fixes issue #4136
This commit is contained in:
Alan Somers 2017-06-17 09:03:37 -06:00 committed by Kurtis Rader
parent 652faa1a13
commit 0e954e4764
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/util.cpp
View file

@ -47,8 +47,8 @@ static int wcsfilecmp_leading_digits(const wchar_t **a, const wchar_t **b) {
/// ///
/// Returns: -1 if a < b, 0 if a == b, 1 if a > b. /// Returns: -1 if a < b, 0 if a == b, 1 if a > b.
int wcsfilecmp(const wchar_t *a, const wchar_t *b) { int wcsfilecmp(const wchar_t *a, const wchar_t *b) {
CHECK(a, NULL); CHECK(a, 0);
CHECK(b, NULL); CHECK(b, 0);
const wchar_t *orig_a = a; const wchar_t *orig_a = a;
const wchar_t *orig_b = b; const wchar_t *orig_b = b;
int retval = 0; // assume the strings will be equal int retval = 0; // assume the strings will be equal