Move netbsd.structs into netbsd

diff --git a/basis/unix/ffi/bsd/netbsd/netbsd.factor b/basis/unix/ffi/bsd/netbsd/netbsd.factor
index 0aee585b481687b9d75239df68fe9612395ed871..e51965242118f369f9b440f1218cc70e59ff4e1d 100644 (file)
--- a/basis/unix/ffi/bsd/netbsd/netbsd.factor
+++ b/basis/unix/ffi/bsd/netbsd/netbsd.factor
@@ -138,4 +138,26 @@ CONSTANT: _SS_MAXSIZE 128
 : _SS_PAD2SIZE ( -- n )
     _SS_MAXSIZE 2 - _SS_PAD1SIZE - _SS_ALIGNSIZE - ; inline
 
-"unix.ffi.bsd.netbsd.structs" require
+STRUCT: sockaddr_storage
+    { ss_len __uint8_t }
+    { ss_family sa_family_t }
+    { __ss_pad1 { char _SS_PAD1SIZE } }
+    { __ss_align __int64_t }
+    { __ss_pad2 { char _SS_PAD2SIZE } } ;
+
+STRUCT: exit_struct
+    { e_termination uint16_t }
+    { e_exit uint16_t } ;
+
+STRUCT: utmpx
+    { ut_user { char _UTX_USERSIZE } }
+    { ut_id   { char _UTX_IDSIZE   } }
+    { ut_line { char _UTX_LINESIZE } }
+    { ut_host { char _UTX_HOSTSIZE } }
+    { ut_session uint16_t }
+    { ut_type uint16_t }
+    { ut_pid pid_t }
+    { ut_exit exit_struct }
+    { ut_ss sockaddr_storage }
+    { ut_tv timeval }
+    { ut_pad { uint32_t 10 } } ;

diff --git a/basis/unix/ffi/bsd/netbsd/structs/structs.factor b/basis/unix/ffi/bsd/netbsd/structs/structs.factor
deleted file mode 100644 (file)
index 40cc907..0000000
--- a/basis/unix/ffi/bsd/netbsd/structs/structs.factor
+++ /dev/null
@@ -1,30 +0,0 @@
-! Copyright (C) 2008 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: alien.c-types alien.syntax unix.time unix.types
-unix.types.netbsd classes.struct unix.ffi ;
-IN: unix
-
-STRUCT: sockaddr_storage
-    { ss_len __uint8_t }
-    { ss_family sa_family_t }
-    { __ss_pad1 { char _SS_PAD1SIZE } }
-    { __ss_align __int64_t }
-    { __ss_pad2 { char _SS_PAD2SIZE } } ;
-
-STRUCT: exit_struct
-    { e_termination uint16_t }
-    { e_exit uint16_t } ;
-
-STRUCT: utmpx
-    { ut_user { char _UTX_USERSIZE } }
-    { ut_id   { char _UTX_IDSIZE   } }
-    { ut_line { char _UTX_LINESIZE } }
-    { ut_host { char _UTX_HOSTSIZE } }
-    { ut_session uint16_t }
-    { ut_type uint16_t }
-    { ut_pid pid_t }
-    { ut_exit exit_struct }
-    { ut_ss sockaddr_storage }
-    { ut_tv timeval }
-    { ut_pad { uint32_t 10 } } ;
-

diff --git a/basis/unix/ffi/bsd/netbsd/structs/tags.txt b/basis/unix/ffi/bsd/netbsd/structs/tags.txt
deleted file mode 100644 (file)
index 6bf6830..0000000
--- a/basis/unix/ffi/bsd/netbsd/structs/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-unportable