From 9b43adea005751d60855184719b6c315b6b60035 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Wed, 1 May 2019 12:17:56 +0000
Subject: [PATCH] Oops, move this outside the s! block

---
 src/unix/notbsd/linux/other/mod.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs
index c7f98735a6f9b..8a643768de0c8 100644
--- a/src/unix/notbsd/linux/other/mod.rs
+++ b/src/unix/notbsd/linux/other/mod.rs
@@ -61,19 +61,6 @@ s! {
         _align: [usize; 0],
     }
 
-    impl siginfo_t {
-        pub unsafe fn si_addr(&self) -> *mut ::c_void {
-            #[repr(C)]
-            struct siginfo_sigfault {
-                _si_signo: ::c_int,
-                _si_errno: ::c_int,
-                _si_code: ::c_int,
-                si_addr: *mut ::c_void
-            }
-            (*(self as *const siginfo_t as *const siginfo_sigfault)).si_addr
-        }
-    }
-
     pub struct glob64_t {
         pub gl_pathc: ::size_t,
         pub gl_pathv: *mut *mut ::c_char,
@@ -213,6 +200,19 @@ s! {
     }
 }
 
+impl siginfo_t {
+    pub unsafe fn si_addr(&self) -> *mut ::c_void {
+        #[repr(C)]
+        struct siginfo_sigfault {
+            _si_signo: ::c_int,
+            _si_errno: ::c_int,
+            _si_code: ::c_int,
+            si_addr: *mut ::c_void
+        }
+        (*(self as *const siginfo_t as *const siginfo_sigfault)).si_addr
+    }
+}
+
 s_no_extra_traits! {
     pub struct utmpx {
         pub ut_type: ::c_short,