Module: wine Branch: master Commit: 93630ce14ebf16333fda8481b5ede6f587eb32ca URL: https://gitlab.winehq.org/wine/wine/-/commit/93630ce14ebf16333fda8481b5ede6f...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jun 12 12:06:33 2023 +0200
include: Remove redundant __WINE_USE_MSVCRT checks.
---
dlls/dinput/tests/driver_hid.h | 2 +- dlls/msi/tests/custom.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- include/msvcrt/corecrt.h | 2 +- include/winternl.h | 4 ---- programs/services/tests/service.c | 6 ------ 6 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 10a5c4c90cf..e97b4e3493b 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/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 ) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 5b81deb2c94..30b9040acff 100644 --- a/dlls/msi/tests/custom.c +++ b/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) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 28fbe10c8e1..023f78b5318 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/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) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 9ad707824ff..945d8ac4055 100644 --- a/include/msvcrt/corecrt.h +++ b/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 diff --git a/include/winternl.h b/include/winternl.h index df0f8dc1f84..455e199f3e1 100644 --- a/include/winternl.h +++ b/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 diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 99cf0838bf0..530f551b1ee 100644 --- a/programs/services/tests/service.c +++ b/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;