include: Remove redundant __WINE_USE_MSVCRT checks.

dlls/dinput/tests/driver_hid.h

@@ -177,7 +177,7 @@ static inline const char *debugstr_ioctl( ULONG code )
 
 #ifndef __WINE_WINE_TEST_H
 
-#if !defined( __WINE_USE_MSVCRT ) || defined( __MINGW32__ )
+#ifdef __MINGW32__
 #define __WINE_PRINTF_ATTR( fmt, args ) __attribute__((format( printf, fmt, args )))
 #else
 #define __WINE_PRINTF_ATTR( fmt, args )

dlls/msi/tests/custom.c

@@ -32,7 +32,7 @@
 #include <msiquery.h>
 #include <msidefs.h>
 
-#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__)))
+#ifdef __MINGW32__
 #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
 #else
 #define __WINE_PRINTF_ATTR(fmt,args)

dlls/ntoskrnl.exe/tests/utils.h

@@ -30,7 +30,7 @@
 
 #include <ddk/wdm.h>
 
-#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__)
+#ifdef __MINGW32__
 #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
 #else
 #define __WINE_PRINTF_ATTR(fmt,args)

include/msvcrt/corecrt.h

@@ -323,7 +323,7 @@ typedef struct threadlocaleinfostruct {
 #define _THREADLOCALEINFO
 #endif
 
-#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__)
+#ifdef __MINGW32__
 #define __WINE_CRT_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
 #define __WINE_CRT_SCANF_ATTR(fmt,args)  __attribute__((format (scanf,fmt,args)))
 #else

include/winternl.h

@@ -4823,10 +4823,6 @@ NTSYSAPI void      WINAPI TpWaitForWork(TP_WORK *,BOOL);
 NTSYSAPI NTSTATUS  WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list);
 NTSYSAPI NTSTATUS  WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list);
 
-#ifndef __WINE_USE_MSVCRT
-NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t);
-#endif
-
 /* 32-bit or 64-bit only functions */
 
 #ifdef _WIN64

programs/services/tests/service.c

@@ -26,12 +26,6 @@
 
 #include "wine/test.h"
 
-#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__)
-#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
-#else
-#define __WINE_PRINTF_ATTR(fmt,args)
-#endif
-
 static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID);
 
 static HANDLE pipe_handle = INVALID_HANDLE_VALUE;