]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit
lib/uuid: remove unneeded Windows UUID workaround
authorEric Biggers <ebiggers@google.com>
Sat, 28 Jan 2023 22:46:51 +0000 (14:46 -0800)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 30 Jan 2023 05:03:16 +0000 (00:03 -0500)
commit584995aa38c95eefc7290249d81a9322a51af11f
tree8e8162a2eb79725c2d26922194fac43a34e53044
parentcb588deaaeefb63b7046f52e7563a007e7a054a6
lib/uuid: remove unneeded Windows UUID workaround

Some .c files in lib/uuid/ contain the following:

#ifdef _WIN32
#define _WIN32_WINNT 0x0500
#include <windows.h>
#define UUID MYUUID
#endif

This seems to have been intended to allow the use of a local "UUID" type
without colliding with "UUID" in the Windows API.  However, this is
unnecessary because there's no local "UUID" type -- there's only uuid_t.

None of these .c files need the include of windows.h, either.

Finally, the unconditional definition of _WIN32_WINNT causes a compiler
warning when the user defines _WIN32_WINNT themself.

Since this code is unnecessary and is causing problems, just remove it.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
lib/uuid/Android.bp
lib/uuid/gen_uuid.c
lib/uuid/tst_uuid.c
lib/uuid/uuid_time.c