diff mbox series

[uclibc-ng-devel,3/6] Fix warning about macro redefinition

Message ID 20200922121703.12838-4-ysionneau@kalray.eu
State Accepted
Headers show
Series Warning fixes | expand

Commit Message

Yann Sionneau Sept. 22, 2020, 12:17 p.m. UTC 
Fixes this:

libc/misc/internals/tempname.c: In function 'brain_damaged_fillrand':
libc/misc/internals/tempname.c:155:0: warning: "L" redefined
 #define L ((UINT32_MAX % NUM_LETTERS + 1) % NUM_LETTERS)

In file included from ./libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.h:24:0,
                 from ./include/bits/libc-lock.h:35,
                 from ./include/bits/stdio-lock.h:22,
                 from ./include/bits/uClibc_mutex.h:73,
                 from ./include/bits/uClibc_stdio.h:83,
                 from ./include/stdio.h:71,
                 from libc/misc/internals/tempname.c:35:
./libc/sysdeps/linux/kvx/sysdep.h:40:0: note: this is the location of the previous definition
 #  define L(name) $L##name

Signed-off-by: Yann Sionneau <ysionneau@kalray.eu>
---
 libc/misc/internals/tempname.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index ca87b0c06..d3a8ccbd8 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -152,12 +152,12 @@  static void brain_damaged_fillrand(unsigned char *buf, unsigned int len)
 	for (i = 0; i < len; ++i) {
 		rh = high % NUM_LETTERS;
 		high /= NUM_LETTERS;
-#define L ((UINT32_MAX % NUM_LETTERS + 1) % NUM_LETTERS)
-		k = (low % NUM_LETTERS) + (L * rh);
-#undef L
-#define H ((UINT32_MAX / NUM_LETTERS) + ((UINT32_MAX % NUM_LETTERS + 1) / NUM_LETTERS))
-		low = (low / NUM_LETTERS) + (H * rh) + (k / NUM_LETTERS);
-#undef H
+#define _L ((UINT32_MAX % NUM_LETTERS + 1) % NUM_LETTERS)
+		k = (low % NUM_LETTERS) + (_L * rh);
+#undef _L
+#define _H ((UINT32_MAX / NUM_LETTERS) + ((UINT32_MAX % NUM_LETTERS + 1) / NUM_LETTERS))
+		low = (low / NUM_LETTERS) + (_H * rh) + (k / NUM_LETTERS);
+#undef _H
 		k %= NUM_LETTERS;
 		buf[i] = letters[k];
 	}