[llvm] r198690 - Try to fix the windows build. The comments in other files don't seem to

[Robinson, Paul]

> -----Original Message-----
> From: llvm-commits-bounces at cs.uiuc.edu [mailto:llvm-commits-
> bounces at cs.uiuc.edu] On Behalf Of Chandler Carruth
> Sent: Tuesday, January 07, 2014 4:37 AM
> To: llvm-commits at cs.uiuc.edu
> Subject: [llvm] r198690 - Try to fix the windows build. The comments in
> other files don't seem to
> 
> Author: chandlerc
> Date: Tue Jan  7 06:37:13 2014
> New Revision: 198690
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=198690&view=rev
> Log:
> Try to fix the windows build. The comments in other files don't seem to
> be quite accurate. =]
> 
> Modified:
>     llvm/trunk/lib/Support/Windows/Process.inc
>     llvm/trunk/lib/Support/Windows/Signals.inc
> 
> Modified: llvm/trunk/lib/Support/Windows/Process.inc
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/lib/Support/Windows/Process.inc?rev=198690&r1=198689&
> r2=198690&view=diff
> ========================================================================
> ======
> --- llvm/trunk/lib/Support/Windows/Process.inc (original)
> +++ llvm/trunk/lib/Support/Windows/Process.inc Tue Jan  7 06:37:13 2014
> @@ -12,15 +12,16 @@
>  //===------------------------------------------------------------------
> ----===//
> 
>  #include "llvm/Support/Allocator.h"
> +#include <malloc.h>
> +
> +// The Windows.h header must be after LLVM and standard headers.

It sure looks like Windows.h is now *before* (most of) the 
standard headers here...

> +#include "Windows.h"
> +
>  #include <direct.h>
>  #include <io.h>
> -#include <malloc.h>
>  #include <psapi.h>
>  #include <shellapi.h>
> 
> -// The Windows.h header must be the last one included.
> -#include "Windows.h"
> -
>  #ifdef __MINGW32__
>   #if (HAVE_LIBPSAPI != 1)
>    #error "libpsapi.a should be present"
> 
> Modified: llvm/trunk/lib/Support/Windows/Signals.inc
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/lib/Support/Windows/Signals.inc?rev=198690&r1=198689&
> r2=198690&view=diff
> ========================================================================
> ======
> --- llvm/trunk/lib/Support/Windows/Signals.inc (original)
> +++ llvm/trunk/lib/Support/Windows/Signals.inc Tue Jan  7 06:37:13 2014
> @@ -16,6 +16,9 @@
>  #include <stdio.h>
>  #include <vector>
> 
> +// The Windows.h header must be after LLVM and standard headers.
> +#include "Windows.h"
> +
>  #ifdef __MINGW32__
>   #include <imagehlp.h>
>  #else
> @@ -23,9 +26,6 @@
>  #endif
>  #include <psapi.h>
> 
> -// The Windows.h header must be the last one included.
> -#include "Windows.h"
> -
>  #ifdef _MSC_VER
>   #pragma comment(lib, "psapi.lib")
>   #pragma comment(lib, "dbghelp.lib")
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits