qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libio: Define AT_RENAME_* with the same tokens as Linux 

Linux uses different expressions for the RENAME_* and AT_RENAME_*
constants.  Mirror that in <stdio.h>, so that the macro redefinitions
do not result in preprocessor warnings.

Reviewed-by: Collin Funk <collin.funk1@gmail.com>
This commit is contained in:
Florian Weimer 2025-09-05 19:02:57 +02:00
parent 5d45da09e6
commit b173557da9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libio/stdio.h
View File

@ -168,11 +168,11 @@ extern int renameat (int __oldfd, const char *__old, int __newfd,
#ifdef __USE_GNU #ifdef __USE_GNU
/* Flags for renameat2. */ /* Flags for renameat2. */
# define RENAME_NOREPLACE (1 << 0) # define RENAME_NOREPLACE (1 << 0)
# define AT_RENAME_NOREPLACE RENAME_NOREPLACE # define AT_RENAME_NOREPLACE 0x0001
# define RENAME_EXCHANGE (1 << 1) # define RENAME_EXCHANGE (1 << 1)
# define AT_RENAME_EXCHANGE RENAME_EXCHANGE # define AT_RENAME_EXCHANGE 0x0002
# define RENAME_WHITEOUT (1 << 2) # define RENAME_WHITEOUT (1 << 2)
# define AT_RENAME_WHITEOUT RENAME_WHITEOUT # define AT_RENAME_WHITEOUT 0x0004
/* Rename file OLD relative to OLDFD to NEW relative to NEWFD, with /* Rename file OLD relative to OLDFD to NEW relative to NEWFD, with
additional flags. */ additional flags. */

6
stdio-common/tst-renameat2.c
View File

@ -28,6 +28,12 @@
#include <support/xunistd.h> #include <support/xunistd.h>
#include <unistd.h> #include <unistd.h>
/* These constants are defined with different token sequences,
matching the Linux definitions, to avoid preprocessor warnings. */
_Static_assert (RENAME_NOREPLACE == AT_RENAME_NOREPLACE, "RENAME_NOREPLACE");
_Static_assert (RENAME_EXCHANGE == AT_RENAME_EXCHANGE, "RENAME_EXCHANGE");
_Static_assert (RENAME_WHITEOUT == AT_RENAME_WHITEOUT, "RENAME_WHITEOUT");
/* Directory with the temporary files. */ /* Directory with the temporary files. */
static char *directory; static char *directory;
static int directory_fd; static int directory_fd;