randomtest fixes

[oweals/busybox.git] / runit / runit_lib.h

diff --git a/runit/runit_lib.h b/runit/runit_lib.h
index c94e61cf2d985c68eacc762b6d3558ece12808cf..88d1c9f222c6820abe7dd4fdb85ad9f655552bd7 100644 (file)
--- a/runit/runit_lib.h
+++ b/runit/runit_lib.h
@@ -25,14 +25,10 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#if __GNUC_PREREQ(4,1)
-# pragma GCC visibility push(hidden)
-#endif
-
-extern unsigned byte_chr(char *s,unsigned n,int c);
-
-#define direntry struct dirent
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
+//extern unsigned byte_chr(char *s,unsigned n,int c);
+//
 //struct tai {
 //     uint64_t x;
 //};
@@ -88,11 +84,11 @@ extern unsigned pmatch(const char *, const char *, unsigned);
  * runsv / supervise / sv stuff
  */
 typedef struct svstatus_t {
-       uint64_t time_be64 ATTRIBUTE_PACKED;
-       uint32_t time_nsec_be32 ATTRIBUTE_PACKED;
-       uint32_t pid_le32 ATTRIBUTE_PACKED;
+       uint64_t time_be64 PACKED;
+       uint32_t time_nsec_be32 PACKED;
+       uint32_t pid_le32 PACKED;
        uint8_t  paused;
-       uint8_t  want;
+       uint8_t  want; /* 'u' or 'd' */
        uint8_t  got_term;
        uint8_t  run_or_finish;
 } svstatus_t;
@@ -100,6 +96,4 @@ struct ERR_svstatus_must_be_20_bytes {
        char ERR_svstatus_must_be_20_bytes[sizeof(svstatus_t) == 20 ? 1 : -1];
 };
 
-#if __GNUC_PREREQ(4,1)
-# pragma GCC visibility pop
-#endif
+POP_SAVED_FUNCTION_VISIBILITY