Skip to content

Commit

Permalink
Move system header includes above valgrind.h include
Browse files Browse the repository at this point in the history
This allows rustc to be build under msys2's mingw64 gcc
  • Loading branch information
c-nixon committed Aug 8, 2014
1 parent 8a02304 commit c377f9e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/rt/rust_builtin.c
Expand Up @@ -8,10 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

/* Foreign builtins. */

#include "valgrind/valgrind.h"

#include <stdint.h>
#include <time.h>
#include <string.h>
Expand Down Expand Up @@ -41,6 +37,10 @@
#endif
#endif

/* Foreign builtins. */
//include valgrind.h after stdint.h so that uintptr_t is defined for msys2 w64
#include "valgrind/valgrind.h"

#ifdef __ANDROID__
time_t
timegm(struct tm *tm)
Expand Down

5 comments on commit c377f9e

@bors
Copy link
Contributor

@bors bors commented on c377f9e Aug 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at c-nixon@c377f9e

@bors
Copy link
Contributor

@bors bors commented on c377f9e Aug 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging c-nixon/rust/master = c377f9e into auto

@bors
Copy link
Contributor

@bors bors commented on c377f9e Aug 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c-nixon/rust/master = c377f9e merged ok, testing candidate = a23d679

@bors
Copy link
Contributor

@bors bors commented on c377f9e Aug 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = a23d679

Please sign in to comment.