https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acabbb7b8595ca5794fc0d...
commit acabbb7b8595ca5794fc0dfffc16c052fb4c0e72 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Sat Dec 16 22:48:11 2017 +0100
[VFDLIB] Fix preprocessor directive compilation error when being used inside a macro expansion on MSVC. --- modules/rosapps/lib/vfdlib/vfdctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/rosapps/lib/vfdlib/vfdctl.c b/modules/rosapps/lib/vfdlib/vfdctl.c index 54c3320e39..69f8cd5abd 100644 --- a/modules/rosapps/lib/vfdlib/vfdctl.c +++ b/modules/rosapps/lib/vfdlib/vfdctl.c @@ -2928,13 +2928,14 @@ DWORD WINAPI VfdCheckDriverFile( fixedinfo->dwFileType != VFT_DRV || fixedinfo->dwFileSubtype != VFT2_DRV_SYSTEM) {
- VFDTRACE(0, #ifndef __REACTOS__ + VFDTRACE(0, (FUNC ": Invalid file type flags\n")); #else + VFDTRACE(0, (FUNC ": Invalid file type flags. os: %x (%x), type: %x (%x), subtype: %x (%x)\n", - fixedinfo->dwFileOS, VOS_NT_WINDOWS32, fixedinfo->dwFileType, VFT_DRV, - fixedinfo->dwFileSubtype, VFT2_DRV_SYSTEM)); + fixedinfo->dwFileOS, VOS_NT_WINDOWS32, fixedinfo->dwFileType, VFT_DRV, + fixedinfo->dwFileSubtype, VFT2_DRV_SYSTEM)); #endif
ret = ERROR_BAD_DRIVER;