git p4 test: wait longer for p4d to start and test its pid

diff --git a/wt-status.h b/wt-status.h
index 6dd7207e25eb0292ba6630c9521c0eae719bb11d..14aa9f7e13342f1210ead3aca658a6ed60961649 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -56,7 +56,9 @@ struct wt_status {
        enum untracked_status_type show_untracked_files;
        const char *ignore_submodule_arg;
        char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
-       int colopts;
+       unsigned colopts;
+       int null_termination;
+       int show_branch;
 
        /* These are computed during processing of the individual sections */
        int commitable;
@@ -73,8 +75,8 @@ void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);
 
-void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_branch);
-void wt_porcelain_print(struct wt_status *s, int null_termination);
+void wt_shortstatus_print(struct wt_status *s);
+void wt_porcelain_print(struct wt_status *s);
 
 void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, ...)
        ;