Skip to content

Commit 8177d51

Browse files
author
git apple-llvm automerger
committed
Merge commit 'b30e42922aea' from llvm.org/master into apple/main
2 parents 3032fd9 + b30e429 commit 8177d51

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

libcxx/test/support/msvc_stdlib_force_include.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#ifndef _LIBCXX_IN_DEVCRT
1616
// Silence warnings about CRT machinery.
17-
#define _CRT_SECURE_NO_WARNINGS
17+
#define _CRT_SECURE_NO_WARNINGS 1
1818

1919
// Avoid assertion dialogs.
2020
#define _CRT_SECURE_INVALID_PARAMETER(EXPR) ::abort()

libcxx/utils/libcxx/test/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ def configure_compile_flags(self):
272272
compile_flags_str = self.get_lit_conf('compile_flags', '')
273273
self.cxx.compile_flags += shlex.split(compile_flags_str)
274274
if self.target_info.is_windows():
275-
# FIXME: Can we remove this?
276275
self.cxx.compile_flags += ['-D_CRT_SECURE_NO_WARNINGS']
277276
# Don't warn about using common but nonstandard unprefixed functions
278277
# like chdir, fileno.

0 commit comments

Comments
 (0)