Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-21 09:24:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build on 32-bit systems

Browse source 
This was a weird case of the integer converseys.

Fixes #6609.

(cherry picked from commit 399a71645e)
This commit is contained in:
Fabian Homborg 2020-02-15 10:10:59 +01:00 committed by David Adam
parent 74ee866239
commit 0c905e8121
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wutil.cpp
View file

@ -305,10 +305,11 @@ int fd_check_is_remote(int fd) {
}
// Linux has constants for these like NFS_SUPER_MAGIC, SMB_SUPER_MAGIC, CIFS_MAGIC_NUMBER but
// these are in varying headers. Simply hard code them.
switch (buf.f_type) {
// NOTE: The cast is necessary for 32-bit systems because of the 4-byte CIFS_MAGIC_NUMBER
switch ((unsigned int)buf.f_type) {
case 0x6969: // NFS_SUPER_MAGIC
case 0x517B: // SMB_SUPER_MAGIC
case 0xFF534D42: // CIFS_MAGIC_NUMBER
case 0xFF534D42u: // CIFS_MAGIC_NUMBER
return 1;
default:
// Other FSes are assumed local.