Module: wine Branch: master Commit: d3d06c46d2cd5dc7d214b3e7f6a978b8141c02b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d06c46d2cd5dc7d214b3e7f6...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sat Jan 29 00:58:18 2011 +0300
ntdll: Fix a compile time warning.
---
dlls/ntdll/file.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 68bed0e..4d49956 100644 --- 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) && \ - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \ - VALGRIND_MAKE_MEM_DEFINED( \ - (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \ - FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \ + if (FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \ + if ((size) >= FIELD_OFFSET(t, f2)) \ + VALGRIND_MAKE_MEM_DEFINED( \ + (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \ + FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \ } while (0)
switch (code)