ntdll: Fix a compile time warning.

d3d06c46 · Nikolay Sivov · Alexandre Julliard · b03f8771 · d3d06c46
Commit d3d06c46 authored Jan 29, 2011 by Nikolay Sivov Committed by Alexandre Julliard Feb 01, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

file.c dlls/ntdll/file.c +5 -5

No files found.
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1290,11 +1290,11 @@ static void ignore_server_ioctl_struct_holes (ULONG code, const void *in_buffer,
 #ifdef VALGRIND_MAKE_MEM_DEFINED
 # define IGNORE_STRUCT_HOLE(buf, size, t, f1, f2) \
    do { \
-        if ((size) >= FIELD_OFFSET(t, f2) && \
+        if (FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \
-            FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \
+            if ((size) >= FIELD_OFFSET(t, f2)) \
-            VALGRIND_MAKE_MEM_DEFINED( \
+                VALGRIND_MAKE_MEM_DEFINED( \
-                (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \
+                    (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \
-                FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \
+                    FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \
    } while (0)
    switch (code)