[PATCH] [libcxx] Distinguish between MSVC, MSVCRT, and Windows-specific code

Jean-Daniel Dupas devlists at shadowlab.org
Tue Aug 13 01:04:03 PDT 2013


-#include <windows.h> // ymath.h works correctly
+// These are built-in's for clang etc. Provide them for the genuine ms compiler.
+#if _MSC_VER && !__clang__
+#include <float.h> // FLT_ etc.
+#include <limits.h> // CHAR_BIT

----------------------------------------
-#ifndef __clang__ // MSVC-based Clang also defines _MSC_VER
-#include <intrin.h>
+#if _MSC_VER && !__clang__ // clang supports these intrinsics.
 

I think you can replace test like  (_MSC_VER && !__clang__) by _LIBCPP_MSVC which has the same meaning.


Le 13 août 2013 à 03:31, G M <gmisocpp at gmail.com> a écrit :

> Hello
>  
> Could someone please consider this patch to libcxx. it's an improvement and replacement to my prior patch that has yet to be committed. More details about this and the prior patch can be found in previous messages with the same subject line as this message.
>  
> I believe this patch is required as an addition to Nico's patch 187593 unless that patch is reverted.
>  
> This patch restores the ability of libcxx to build "out of the box" on Windows. This patch fixes a typo in my previous patch, adds a few more comments, and in addition hopefully reduces conflicts caused by improvements to more recent MS and GNU compilers, so hopefully there are less errors using them. Otherwise it is conceptually the same as my previous patch.
>  
> As this patch is intended to relate to libcxx on Windows only (so in that sense it should be considered somewhat safe) and given that libcxx doesn't currently compile on Windows at the moment and this patch restores that, I hope this patch can be reviewed and committed or rejected soon as the build on Windows has been broken for around a week now.
>  
> Thanks
> Glen
>  
>  
> <libcxx2.diff>_______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

-- Jean-Daniel








More information about the cfe-commits mailing list