From 13d341356b65a2729ff359daf11d393ddcb0bed7 Mon Sep 17 00:00:00 2001 From: CodingKoopa Date: Fri, 8 Mar 2024 05:43:51 +0000 Subject: [PATCH] win32_io.c: rm GUID type definition This conflicts with the GUID defined in the Windows headers, and we don't seem to use this one. Fixes compiler error (could also be fixed by redefining Windows' GUID): win32_io.c:55:3: error: conflicting types for 'GUID'; have 'struct ' 55 | } GUID; | ^~~~ In file included from /usr/include/w32api/winnt.h:648, from /usr/include/w32api/minwindef.h:163, from /usr/include/w32api/windef.h:9, from /usr/include/w32api/windows.h:69, from win32_io.c:31: /usr/include/w32api/guiddef.h:24:3: note: previous declaration of 'GUID' with type 'GUID' 24 | } GUID; | ^~~~ --- libntfs-3g/win32_io.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libntfs-3g/win32_io.c b/libntfs-3g/win32_io.c index 9c72dee3..41c43c6b 100644 --- a/libntfs-3g/win32_io.c +++ b/libntfs-3g/win32_io.c @@ -45,15 +45,6 @@ typedef unsigned long long DWORD64; #endif -typedef struct { - DWORD data1; /* The first eight hexadecimal digits of the GUID. */ - WORD data2; /* The first group of four hexadecimal digits. */ - WORD data3; /* The second group of four hexadecimal digits. */ - char data4[8]; /* The first two bytes are the third group of four - hexadecimal digits. The remaining six bytes are the - final 12 hexadecimal digits. */ -} GUID; - #include #ifdef HAVE_STDIO_H