[libcxx] r292869 - Merge r292822 - Fixed a typo in __config that prevented the aligned new/delete tests from passing on Mac OS.

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Mon Jan 23 19:05:56 2017
New Revision: 292869

URL: http://llvm.org/viewvc/llvm-project?rev=292869&view=rev
Log:
Merge r292822 - Fixed a typo in __config that prevented the aligned new/delete tests from passing on Mac OS.

Modified:
    libcxx/branches/release_40/include/__config

Modified: libcxx/branches/release_40/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/include/__config?rev=292869&r1=292868&r2=292869&view=diff
==============================================================================
--- libcxx/branches/release_40/include/__config (original)
+++ libcxx/branches/release_40/include/__config Mon Jan 23 19:05:56 2017
@@ -845,7 +845,7 @@ template <unsigned> struct __static_asse
 #if defined(__APPLE__)
 # if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && \
      defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
-#   define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIROMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#   define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 # endif
 # if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #   if __MAC_OS_X_VERSION_MIN_REQUIRED < 1060