From 533cb676817949a3d7c77afee521a3a735f6ef2b Mon Sep 17 00:00:00 2001
From: Paul Sajna <paulsajna@gmail.com>
Date: Sat, 3 Mar 2018 19:33:34 -0800
Subject: [PATCH 1/2] fix Options

---
 src/todo/pthread/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/todo/pthread/lib.rs b/src/todo/pthread/lib.rs
index d616ab9008..8ed6301e47 100644
--- a/src/todo/pthread/lib.rs
+++ b/src/todo/pthread/lib.rs
@@ -215,7 +215,7 @@ pub extern "C" fn pthread_condattr_setpshared(
 pub extern "C" fn pthread_create(
     thread: *mut pthread_t,
     attr: *const pthread_attr_t,
-    start_routine: ::std::option::Option<unsafe extern "C" fn(arg1: *mut libc::c_void) -> *mut libc::c_void>,
+    start_routine: Option<unsafe extern "C" fn(arg1: *mut libc::c_void) -> *mut libc::c_void>,
     arg: *mut libc::c_void,
 ) -> libc::c_int {
     unimplemented!();
@@ -263,7 +263,7 @@ pub extern "C" fn pthread_join(thread: pthread_t, value_ptr: *mut *mut libc::c_v
 #[no_mangle]
 pub extern "C" fn pthread_key_create(
     key: *mut pthread_key_t,
-    destructor: ::std::option::Option<unsafe extern "C" fn(arg1: *mut libc::c_void)>,
+    destructor: Option<unsafe extern "C" fn(arg1: *mut libc::c_void)>,
 ) -> libc::c_int {
     unimplemented!();
 }
@@ -395,7 +395,7 @@ pub extern "C" fn pthread_mutexattr_settype(
 #[no_mangle]
 pub extern "C" fn pthread_once(
     once_control: *mut pthread_once_t,
-    init_routine: ::std::option::Option<unsafe extern "C" fn()>,
+    init_routine: Option<unsafe extern "C" fn()>,
 ) -> libc::c_int {
     unimplemented!();
 }

From 2b16a3693e84a2790e86f30b582999f567533a57 Mon Sep 17 00:00:00 2001
From: Paul Sajna <paulsajna@gmail.com>
Date: Sat, 3 Mar 2018 19:42:29 -0800
Subject: [PATCH 2/2] wrap all function parameters in Options

---
 src/stdlib/src/lib.rs | 6 +++---
 src/unistd/src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/stdlib/src/lib.rs b/src/stdlib/src/lib.rs
index ade51a973a..49b3bfd434 100644
--- a/src/stdlib/src/lib.rs
+++ b/src/stdlib/src/lib.rs
@@ -39,7 +39,7 @@ pub extern "C" fn abs(i: c_int) -> c_int {
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn atexit(func: extern "C" fn()) -> c_int {
+pub unsafe extern "C" fn atexit(func: Option<extern "C" fn()>) -> c_int {
     for i in 0..ATEXIT_FUNCS.len() {
         if ATEXIT_FUNCS[i] == 0 {
             ATEXIT_FUNCS[i] = func as usize;
@@ -66,7 +66,7 @@ pub extern "C" fn atol(s: *const c_char) -> c_long {
 }
 
 #[no_mangle]
-pub extern "C" fn bsearch(key: *const c_void, base: *const c_void, nel: size_t, width: size_t, compar: extern "C" fn(*const c_void, *const c_void) -> c_int) -> *mut c_void {
+pub extern "C" fn bsearch(key: *const c_void, base: *const c_void, nel: size_t, width: size_t, compar: Option<extern "C" fn(*const c_void, *const c_void)> -> c_int) -> *mut c_void {
     unimplemented!();
 }
 
@@ -265,7 +265,7 @@ pub extern "C" fn putenv(s: *mut c_char) -> c_int {
 }
 
 #[no_mangle]
-pub extern "C" fn qsort(base: *mut c_void, nel: size_t, width: size_t, compar: extern "C" fn(*const c_void, *const c_void) -> c_int) {
+pub extern "C" fn qsort(base: *mut c_void, nel: size_t, width: size_t, compar: Option<extern "C" fn(*const c_void, *const c_void)> -> c_int) {
     unimplemented!();
 }
 
diff --git a/src/unistd/src/lib.rs b/src/unistd/src/lib.rs
index 66905beae6..cf911b4f6c 100644
--- a/src/unistd/src/lib.rs
+++ b/src/unistd/src/lib.rs
@@ -310,7 +310,7 @@ pub extern "C" fn pread(fildes: c_int, buf: *mut c_void, nbyte: size_t, offset:
 }
 
 #[no_mangle]
-pub extern "C" fn pthread_atfork(prepare: extern "C" fn(), parent: extern "C" fn(), child: extern "C" fn()) -> c_int {
+pub extern "C" fn pthread_atfork(prepare: Option<extern "C" fn()>, parent: Option<extern "C" fn()>, child: Option<extern "C" fn()>) -> c_int {
     unimplemented!();
 }