[newlib-cygwin/main] Cygwin: cygwin/fs.h: rename FS_COMPRESSED_FL to FS_COMPR_FL
Corinna Vinschen
corinna@sourceware.org
Wed Jan 15 17:33:56 GMT 2025
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1e6a3b39f1c6c8aaec68753bd894dfb3e60da998
commit 1e6a3b39f1c6c8aaec68753bd894dfb3e60da998
Author: Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Wed Jan 15 18:32:55 2025 +0100
Commit: Corinna Vinschen <corinna@vinschen.de>
CommitDate: Wed Jan 15 18:33:31 2025 +0100
Cygwin: cygwin/fs.h: rename FS_COMPRESSED_FL to FS_COMPR_FL
FS_COMPR_FL is the Linux-compatible macro name. Redefine
FS_COMPRESSED_FL as an alias of FS_COMPR_FL for backward
compatibility.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/fhandler/disk_file.cc | 4 ++--
winsup/cygwin/include/cygwin/fs.h | 6 +++++-
winsup/utils/chattr.c | 2 +-
winsup/utils/lsattr.c | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/winsup/cygwin/fhandler/disk_file.cc b/winsup/cygwin/fhandler/disk_file.cc
index 2008fb61ba62..f41198ec0f8a 100644
--- a/winsup/cygwin/fhandler/disk_file.cc
+++ b/winsup/cygwin/fhandler/disk_file.cc
@@ -2789,7 +2789,7 @@ fhandler_disk_file::fs_ioc_setflags (uint64_t flags)
goto out;
}
}
- if ((flags & FS_COMPRESSED_FL) != (old_flags & FS_COMPRESSED_FL))
+ if ((flags & FS_COMPR_FL) != (old_flags & FS_COMPR_FL))
{
if (fh != get_handle ())
NtClose (fh);
@@ -2809,7 +2809,7 @@ fhandler_disk_file::fs_ioc_setflags (uint64_t flags)
goto out;
}
}
- comp = (flags & FS_COMPRESSED_FL)
+ comp = (flags & FS_COMPR_FL)
? COMPRESSION_FORMAT_DEFAULT : COMPRESSION_FORMAT_NONE;
status = NtFsControlFile (fh, NULL, NULL, NULL, &io,
FSCTL_SET_COMPRESSION, &comp, sizeof comp,
diff --git a/winsup/cygwin/include/cygwin/fs.h b/winsup/cygwin/include/cygwin/fs.h
index 76d92453808d..c87ecb9f3002 100644
--- a/winsup/cygwin/include/cygwin/fs.h
+++ b/winsup/cygwin/include/cygwin/fs.h
@@ -37,7 +37,7 @@ details. */
#define FS_TEMP_FL 0x000000100ULL /* DOS Temporary */
#define FS_SPARSE_FL 0x000000200ULL /* Sparse file */
#define FS_REPARSE_FL 0x000000400ULL /* Reparse point */
-#define FS_COMPRESSED_FL 0x000000800ULL /* Compressed file */
+#define FS_COMPR_FL 0x000000800ULL /* Compressed file */
#define FS_OFFLINE_FL 0x000001000ULL /* DOS Offline */
#define FS_NOTINDEXED_FL 0x000002000ULL /* DOS Not context indexed */
#define FS_ENCRYPT_FL 0x000004000ULL /* Encrypted file */
@@ -54,4 +54,8 @@ details. */
/* #define RENAME_EXCHANGE (1 << 1) */
/* #define RENAME_WHITEOUT (1 << 2) */
+/* Add for backward compatibility */
+#define FS_COMPRESSED_FL FS_COMPR_FL
+
+
#endif
diff --git a/winsup/utils/chattr.c b/winsup/utils/chattr.c
index 4ba977112d94..5583cb1989a1 100644
--- a/winsup/utils/chattr.c
+++ b/winsup/utils/chattr.c
@@ -49,7 +49,7 @@ struct
{ FS_TEMP_FL, 't', "Temporary" },
{ FS_SPARSE_FL, 'S', "Sparse" },
{ FS_REPARSE_FL, 'r', NULL },
- { FS_COMPRESSED_FL, 'c', "Compressed" },
+ { FS_COMPR_FL, 'c', "Compressed" },
{ FS_OFFLINE_FL, 'o', NULL },
{ FS_NOTINDEXED_FL, 'n', "Notindexed" },
{ FS_ENCRYPT_FL, 'e', "Encrypted" },
diff --git a/winsup/utils/lsattr.c b/winsup/utils/lsattr.c
index 50935f682ea5..359c18972a80 100644
--- a/winsup/utils/lsattr.c
+++ b/winsup/utils/lsattr.c
@@ -49,7 +49,7 @@ struct
{ FS_TEMP_FL, 't', "Temporary" },
{ FS_SPARSE_FL, 'S', "Sparse" },
{ FS_REPARSE_FL, 'r', "Reparse" },
- { FS_COMPRESSED_FL, 'c', "Compressed" },
+ { FS_COMPR_FL, 'c', "Compressed" },
{ FS_OFFLINE_FL, 'o', "Offline" },
{ FS_NOTINDEXED_FL, 'n', "Notindexed" },
{ FS_ENCRYPT_FL, 'e', "Encrypted" },
More information about the Cygwin-cvs
mailing list