6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Try to fix the windows build. The comments in other files don't seem to

Browse Source 
be quite accurate. =]

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198690 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth 2014-01-07 12:37:13 +00:00
parent bc65a8d518
commit 1446dc9ba8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Support/Windows/Process.inc
View File

@ -12,15 +12,16 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/Support/Allocator.h" #include "llvm/Support/Allocator.h"
#include <malloc.h>
// The Windows.h header must be after LLVM and standard headers.
#include "Windows.h"
#include <direct.h> #include <direct.h>
#include <io.h> #include <io.h>
#include <malloc.h>
#include <psapi.h> #include <psapi.h>
#include <shellapi.h> #include <shellapi.h>
// The Windows.h header must be the last one included.
#include "Windows.h"
#ifdef __MINGW32__ #ifdef __MINGW32__
#if (HAVE_LIBPSAPI != 1) #if (HAVE_LIBPSAPI != 1)
#error "libpsapi.a should be present" #error "libpsapi.a should be present"

6
lib/Support/Windows/Signals.inc
View File

@ -16,6 +16,9 @@
#include <stdio.h> #include <stdio.h>
#include <vector> #include <vector>
// The Windows.h header must be after LLVM and standard headers.
#include "Windows.h"
#ifdef __MINGW32__ #ifdef __MINGW32__
#include <imagehlp.h> #include <imagehlp.h>
#else #else
@ -23,9 +26,6 @@
#endif #endif
#include <psapi.h> #include <psapi.h>
// The Windows.h header must be the last one included.
#include "Windows.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma comment(lib, "psapi.lib") #pragma comment(lib, "psapi.lib")
#pragma comment(lib, "dbghelp.lib") #pragma comment(lib, "dbghelp.lib")