X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=grep.h;h=f00db0e40273c7cca1695ddc6be00921f9da8ef4;hb=309883015ff3af6ce14ff9fe401e06cfce8adb13;hp=a67005de62d1442e7ba6a8dc27320225a0d55819;hpb=b91ffd37d5c18046f7b0bf47e939273bead9e52e;p=git.git

diff --git a/grep.h b/grep.h
index a67005de6..f00db0e40 100644
--- a/grep.h
+++ b/grep.h
@@ -61,29 +61,33 @@ struct grep_opt {
 	struct grep_expr *pattern_expression;
 	int prefix_length;
 	regex_t regexp;
-	unsigned linenum:1;
-	unsigned invert:1;
-	unsigned status_only:1;
-	unsigned name_only:1;
-	unsigned unmatch_name_only:1;
-	unsigned count:1;
-	unsigned word_regexp:1;
-	unsigned fixed:1;
-	unsigned all_match:1;
+	int linenum;
+	int invert;
+	int status_only;
+	int name_only;
+	int unmatch_name_only;
+	int count;
+	int word_regexp;
+	int fixed;
+	int all_match;
 #define GREP_BINARY_DEFAULT	0
 #define GREP_BINARY_NOMATCH	1
 #define GREP_BINARY_TEXT	2
-	unsigned binary:2;
-	unsigned extended:1;
-	unsigned relative:1;
-	unsigned pathname:1;
-	unsigned null_following_name:1;
+	int binary;
+	int extended;
+	int relative;
+	int pathname;
+	int null_following_name;
 	int color;
+	int funcname;
 	char color_match[COLOR_MAXLEN];
 	const char *color_external;
 	int regflags;
 	unsigned pre_context;
 	unsigned post_context;
+	unsigned last_shown;
+	int show_hunk_mark;
+	void *priv;
 };
 
 extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);