#if condition does not contain _CRTBLD check
---
mingw-w64-headers/crt/float.h | 2 +-
mingw-w64-headers/crt/io.h | 2 +-
mingw-w64-headers/crt/memory.h | 2 +-
mingw-w64-headers/crt/sec_api/conio_s.h | 2 +-
mingw-w64-headers/crt/sec_api/stdio_s.h | 2 +-
mingw-w64-headers/crt/sec_api/string_s.h | 2 +-
mingw-w64-headers/crt/sec_api/wchar_s.h | 2 +-
mingw-w64-headers/crt/stdlib.h | 2 +-
mingw-w64-headers/crt/string.h | 2 +-
mingw-w64-headers/crt/time.h | 2 +-
mingw-w64-headers/crt/wchar.h | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
index da8717b836a8..f36aacc75091 100644
--- a/mingw-w64-headers/crt/float.h
+++ b/mingw-w64-headers/crt/float.h
@@ -13,17 +13,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#if (defined (__GNUC__) && defined (__GNUC_MINOR__)) \
|| (defined(__clang__) && defined(__clang_major__))
#if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) \
|| (__clang_major__ >=3)
#if !defined(_FLOAT_H___) && !defined(__FLOAT_H) && !defined(__CLANG_FLOAT_H)
#include_next <float.h>
#endif
diff --git a/mingw-w64-headers/crt/io.h b/mingw-w64-headers/crt/io.h
index 8986931a5526..2e8f5add6f4a 100644
--- a/mingw-w64-headers/crt/io.h
+++ b/mingw-w64-headers/crt/io.h
@@ -11,17 +11,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#pragma pack(push,_CRT_PACKING)
#ifdef __cplusplus
extern "C" {
#endif
_CRTIMP char* __cdecl _getcwd (char*, int);
diff --git a/mingw-w64-headers/crt/memory.h b/mingw-w64-headers/crt/memory.h
index 333771db212d..f48f416ded43 100644
--- a/mingw-w64-headers/crt/memory.h
+++ b/mingw-w64-headers/crt/memory.h
@@ -10,17 +10,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _CONST_RETURN
#define _CONST_RETURN
#endif
diff --git a/mingw-w64-headers/crt/sec_api/conio_s.h
b/mingw-w64-headers/crt/sec_api/conio_s.h
index bcc75646178d..d7f0e9eb3539 100644
--- a/mingw-w64-headers/crt/sec_api/conio_s.h
+++ b/mingw-w64-headers/crt/sec_api/conio_s.h
@@ -11,17 +11,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#ifdef __cplusplus
extern "C" {
#endif
_SECIMP errno_t __cdecl _cgets_s (char *_Buffer,size_t _Size,size_t
*_SizeRead);
__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgets_s, char, _Buffer,
size_t*, _SizeRead)
diff --git a/mingw-w64-headers/crt/sec_api/stdio_s.h
b/mingw-w64-headers/crt/sec_api/stdio_s.h
index 8a736311ef82..23e4e22b8242 100644
--- a/mingw-w64-headers/crt/sec_api/stdio_s.h
+++ b/mingw-w64-headers/crt/sec_api/stdio_s.h
@@ -10,17 +10,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _STDIO_S_DEFINED
#define _STDIO_S_DEFINED
#define L_tmpnam_s L_tmpnam
diff --git a/mingw-w64-headers/crt/sec_api/string_s.h
b/mingw-w64-headers/crt/sec_api/string_s.h
index f1a9e3418561..e3788dd70ef2 100644
--- a/mingw-w64-headers/crt/sec_api/string_s.h
+++ b/mingw-w64-headers/crt/sec_api/string_s.h
@@ -10,17 +10,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#ifdef __cplusplus
extern "C" {
#endif
_CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value);
_CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const
char *_ErrMsg);
_SECIMP errno_t __cdecl strerror_s(char *_Buf,size_t _SizeInBytes,int
_ErrNum);
diff --git a/mingw-w64-headers/crt/sec_api/wchar_s.h
b/mingw-w64-headers/crt/sec_api/wchar_s.h
index 9a3889091ef5..a4e62ba374f1 100644
--- a/mingw-w64-headers/crt/sec_api/wchar_s.h
+++ b/mingw-w64-headers/crt/sec_api/wchar_s.h
@@ -10,17 +10,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _WIO_S_DEFINED
#define _WIO_S_DEFINED
_SECIMP errno_t __cdecl _waccess_s (const wchar_t *_Filename,int
_AccessMode);
diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h
index 8dc1de254919..e3b5499e861b 100644
--- a/mingw-w64-headers/crt/stdlib.h
+++ b/mingw-w64-headers/crt/stdlib.h
@@ -16,17 +16,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#pragma pack(push,_CRT_PACKING)
#ifdef __cplusplus
extern "C" {
#endif
#ifndef NULL
diff --git a/mingw-w64-headers/crt/string.h b/mingw-w64-headers/crt/string.h
index 49027c18dbe8..afcaf0b4f1dc 100644
--- a/mingw-w64-headers/crt/string.h
+++ b/mingw-w64-headers/crt/string.h
@@ -10,17 +10,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _NLSCMP_DEFINED
#define _NLSCMP_DEFINED
#define _NLSCMPERROR 2147483647
diff --git a/mingw-w64-headers/crt/time.h b/mingw-w64-headers/crt/time.h
index 473597e38b7f..3132ab863973 100644
--- a/mingw-w64-headers/crt/time.h
+++ b/mingw-w64-headers/crt/time.h
@@ -14,17 +14,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
/* Adding timespec definition. */
#include <sys/timeb.h>
#pragma pack(push,_CRT_PACKING)
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h
index ab7187721fd2..e40b81298030 100644
--- a/mingw-w64-headers/crt/wchar.h
+++ b/mingw-w64-headers/crt/wchar.h
@@ -16,17 +16,17 @@
#if defined(__LIBMSVCRT__)
/* When building mingw-w64, this should be blank. */
#define _SECIMP
#else
#ifndef _SECIMP
#define _SECIMP __declspec(dllimport)
#endif /* _SECIMP */
-#endif /* defined(_CRTBLD) || defined(__LIBMSVCRT__) */
+#endif /* defined(__LIBMSVCRT__) */
#pragma pack(push,_CRT_PACKING)
#ifdef __cplusplus
extern "C" {
#endif
#ifndef WCHAR_MIN /* also in stdint.h */
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
