Skip to content

Commit

Permalink
Fix test failure on windows
Browse files Browse the repository at this point in the history
This patch ensures that the multiple extern definitions of `free` in the
run-pass tests have the same declaration, working around #7352.
  • Loading branch information
Blei committed Jun 24, 2013
1 parent ce888a5 commit f8ae3cd
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/test/run-pass/extern-pub.rs
@@ -1,7 +1,5 @@
use std::libc;

extern {
pub unsafe fn free(p: *libc::c_void);
pub unsafe fn free(p: *u8);
}

pub fn main() {
Expand Down

9 comments on commit f8ae3cd

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 24, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 24, 2013

Choose a reason for hiding this comment

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

merging Blei/rust/intrinsic-overhaul = f8ae3cd into auto

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 24, 2013

Choose a reason for hiding this comment

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

Blei/rust/intrinsic-overhaul = f8ae3cd merged ok, testing candidate = a8e3d4c

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 25, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 25, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 25, 2013

Choose a reason for hiding this comment

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

merging Blei/rust/intrinsic-overhaul = f8ae3cd into auto

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 25, 2013

Choose a reason for hiding this comment

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

Blei/rust/intrinsic-overhaul = f8ae3cd merged ok, testing candidate = 7aee5da

@bors
Copy link
Contributor

@bors bors commented on f8ae3cd Jun 25, 2013

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 = 7aee5da

Please sign in to comment.