Re: [PATCH 1/3] read-trees: refactor the unpack_trees() part

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:

> diff --git a/unpack-trees.h b/unpack-trees.h
> new file mode 100644
> index 0000000..babfcd7
> --- /dev/null
> +++ b/unpack-trees.h
> @@ -0,0 +1,30 @@
> +#ifndef UNPACK_TREES_H
> +#define UNPACK_TREES_H
>...
> +struct unpack_trees_options {
> +	int reset;
> +	int merge;
> +	int update;
> +	int index_only;
> +	int nontrivial_merge;
> +	int trivial_merges_only;
> +	int verbose_update;
> +	int aggressive;
> +	const char *prefix;
> +	merge_fn_t fn;
> +
> +	int head_idx;
> +	int merge_size;
> +
> +	struct cache_entry df_conflict_entry;
> +};

Hmmmm.....

gcc -o unpack-trees.o -c -O2 -Werror -ansi -pedantic -std=c99 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wall -Wdeclaration-after-statement -g -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRLCPY unpack-trees.c
cc1: warnings being treated as errors
In file included from unpack-trees.c:7:
unpack-trees.h:24: warning: invalid use of structure with flexible array member
make: *** [unpack-trees.o] Error 1


-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]