diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-01-28 14:46:51 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-01-30 00:03:16 -0500 |
| commit | 584995aa38c95eefc7290249d81a9322a51af11f (patch) | |
| tree | 8e8162a2eb79725c2d26922194fac43a34e53044 | |
| parent | cb588deaaeefb63b7046f52e7563a007e7a054a6 (diff) | |
| download | e2fsprogs-584995aa38c95eefc7290249d81a9322a51af11f.tar.gz | |
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>
| -rw-r--r-- | lib/uuid/Android.bp | 2 | ||||
| -rw-r--r-- | lib/uuid/gen_uuid.c | 5 | ||||
| -rw-r--r-- | lib/uuid/tst_uuid.c | 6 | ||||
| -rw-r--r-- | lib/uuid/uuid_time.c | 6 |
4 files changed, 0 insertions, 19 deletions
diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp index 67968dba3..daf30bb94 100644 --- a/lib/uuid/Android.bp +++ b/lib/uuid/Android.bp @@ -45,8 +45,6 @@ cc_library { ], target: { windows: { - // Cannot suppress the _WIN32_WINNT redefined warning. - cflags: ["-Wno-error"], include_dirs: [ "external/e2fsprogs/include/mingw" ], enabled: true }, diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c index a2225ccee..2f028867a 100644 --- a/lib/uuid/gen_uuid.c +++ b/lib/uuid/gen_uuid.c @@ -41,11 +41,6 @@ #include "config.h" -#ifdef _WIN32 -#define _WIN32_WINNT 0x0500 -#include <windows.h> -#define UUID MYUUID -#endif #include <stdio.h> #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/uuid/tst_uuid.c b/lib/uuid/tst_uuid.c index 649bfbc05..c1c290158 100644 --- a/lib/uuid/tst_uuid.c +++ b/lib/uuid/tst_uuid.c @@ -34,12 +34,6 @@ #include "config.h" -#ifdef _WIN32 -#define _WIN32_WINNT 0x0500 -#include <windows.h> -#define UUID MYUUID -#endif - #include <stdio.h> #include <stdlib.h> diff --git a/lib/uuid/uuid_time.c b/lib/uuid/uuid_time.c index af837a2ca..b519d3c4b 100644 --- a/lib/uuid/uuid_time.c +++ b/lib/uuid/uuid_time.c @@ -36,12 +36,6 @@ #include "config.h" -#ifdef _WIN32 -#define _WIN32_WINNT 0x0500 -#include <windows.h> -#define UUID MYUUID -#endif - #include <stdio.h> #ifdef HAVE_UNISTD_H #include <unistd.h> |