Skip to content

Commit

Permalink
Merge pull request #1627 from tari/1201-example-fix
Browse files Browse the repository at this point in the history
Correct example in 1201
  • Loading branch information
nikomatsakis committed Jun 2, 2016
2 parents a4a22d7 + 0496c69 commit 8fb8742
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions text/1201-naked-fns.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ use std::sync::atomic::{self, AtomicUsize, Ordering};

#[naked]
#[cfg(target_arch="x86")]
unsafe fn isr_3() {
unsafe extern "C" fn isr_3() {
asm!("pushad
call increment_breakpoint_count
popad
Expand All @@ -159,7 +159,7 @@ pub fn increment_breakpoint_count() {
bp_count.fetch_add(1, Ordering::Relaxed);
}

fn register_isr(vector: u8, handler: fn() -> ()) { /* ... */ }
fn register_isr(vector: u8, handler: unsafe extern "C" fn() -> ()) { /* ... */ }

fn main() {
register_isr(3, isr_3);
Expand Down

0 comments on commit 8fb8742

Please sign in to comment.