Mercurial > mxe-octave
view src/readline-1-fixes.patch @ 7103:8acdb722fac4
* src/sdl2.mk: update to v2.30.1
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 11 Mar 2024 10:22:37 -0400 |
parents | 41e50d658de0 |
children |
line wrap: on
line source
diff -ur readline-8.1/colors.c readline-8.1.1/colors.c --- readline-8.1/colors.c 2019-11-19 10:30:54.000000000 -0500 +++ readline-8.1.1/colors.c 2020-12-19 07:54:28.888704198 -0500 @@ -207,8 +207,10 @@ #endif if (is_colored (C_CAP) && 0) //f->has_capability) colored_filetype = C_CAP; +#if defined(S_IXUGO) else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC)) colored_filetype = C_EXEC; +#endif else if ((1 < astat.st_nlink) && is_colored (C_MULTIHARDLINK)) colored_filetype = C_MULTIHARDLINK; } @@ -222,8 +224,10 @@ colored_filetype = C_STICKY_OTHER_WRITABLE; else #endif +#if defined (S_IWOTH) if ((mode & S_IWOTH) != 0 && is_colored (C_OTHER_WRITABLE)) colored_filetype = C_OTHER_WRITABLE; +#endif #if defined (S_ISVTX) else if ((mode & S_ISVTX) != 0 && is_colored (C_STICKY)) colored_filetype = C_STICKY; Only in readline-8.1.1: colors.c.orig diff -ur readline-8.1/colors.h readline-8.1.1/colors.h --- readline-8.1/colors.h 2016-01-25 10:38:11.000000000 -0500 +++ readline-8.1.1/colors.h 2020-12-19 07:54:28.888704198 -0500 @@ -96,7 +96,7 @@ }; -#if !S_IXUGO +#if !S_IXUGO && defined(S_IXUSR) && defined(S_IXGRP) && defined(S_IXOTH) # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) #endif diff -ur readline-8.1/posixstat.h readline-8.1.1/posixstat.h --- readline-8.1/posixstat.h 2019-12-19 11:24:37.000000000 -0500 +++ readline-8.1.1/posixstat.h 2020-12-19 07:54:28.888704198 -0500 @@ -78,30 +78,44 @@ #if defined (S_IFBLK) && !defined (S_ISBLK) #define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */ +#elif !defined (S_IFBLK) +#define S_ISBLK(m) 0 #endif #if defined (S_IFCHR) && !defined (S_ISCHR) #define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */ +#elif !defined (S_IFCHR) +#define S_ISCHR(m) 0 #endif #if defined (S_IFDIR) && !defined (S_ISDIR) #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */ +#elif !defined (S_IFDIR) +#define S_ISDIR(m) 0 #endif #if defined (S_IFREG) && !defined (S_ISREG) #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */ +#elif !defined (S_IFREG) +#define S_ISREG(m) 0 #endif #if defined (S_IFIFO) && !defined (S_ISFIFO) #define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */ +#elif !defined (S_IFIFO) +#define S_ISFIFO(m) 0 #endif #if defined (S_IFLNK) && !defined (S_ISLNK) #define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */ +#elif !defined (S_IFLNK) +#define S_ISLNK(m) 0 #endif #if defined (S_IFSOCK) && !defined (S_ISSOCK) #define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */ +#elif !defined (S_IFSOCK) +#define S_ISSOCK(m) 0 #endif /* @@ -157,6 +171,8 @@ /* These are non-standard, but are used in builtins.c$symbolic_umask() */ #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) +#if defined(S_IXUSR) && defined(S_IXGRP) && defined(S_IXOTH) #define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) +#endif #endif /* _POSIXSTAT_H_ */