Skip to content

Commit

Permalink
Fix more rollup problems
Browse files Browse the repository at this point in the history
  • Loading branch information
steveklabnik committed Jan 17, 2015
1 parent 69e9b46 commit 6553c0f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/doc/trpl/ffi.md
Expand Up @@ -529,6 +529,7 @@ fairly easy, but requires a few things:
pub extern fn hello_rust() -> *const u8 {
"Hello, world!\0".as_ptr()
}
# fn main() {}
```

The `extern` makes this function adhere to the C calling convention, as
Expand Down

7 comments on commit 6553c0f

@bors
Copy link
Contributor

@bors bors commented on 6553c0f Jan 17, 2015

Choose a reason for hiding this comment

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

saw approval from steveklabnik
at steveklabnik@6553c0f

@bors
Copy link
Contributor

@bors bors commented on 6553c0f Jan 17, 2015

Choose a reason for hiding this comment

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

merging steveklabnik/rust/rollup = 6553c0f into auto

@bors
Copy link
Contributor

@bors bors commented on 6553c0f Jan 17, 2015

Choose a reason for hiding this comment

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

status: {"merge_sha": "f4f10dba2975b51c2d2c92157018db3ac13d4d4a"}

@bors
Copy link
Contributor

@bors bors commented on 6553c0f Jan 17, 2015

Choose a reason for hiding this comment

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

steveklabnik/rust/rollup = 6553c0f merged ok, testing candidate = f4f10db

@bors
Copy link
Contributor

@bors bors commented on 6553c0f Jan 17, 2015

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

@bors
Copy link
Contributor

@bors bors commented on 6553c0f Jan 17, 2015

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

Please sign in to comment.