mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

Browse Source
This commit is contained in:
Junio C Hamano
2005-08-28 23:02:01 -07:00
parent 928f74de22 fb2af0375b
commit 10d781b9ca
18 changed files with 73 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cache.h
View File

@ -58,7 +58,11 @@
* We accept older names for now but warn.
*/
extern char *gitenv_bc(const char *);
#ifdef __GNUC__
#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
#else
#define gitenv(e) (getenv(e) ? getenv(e) : gitenv_bc(e))
#endif
/*
* Basic data structures for the directory cache
@ -100,7 +104,7 @@ struct cache_entry {
unsigned int ce_size;
unsigned char sha1[20];
unsigned short ce_flags;
char name[0];
char name[];
};
#define CE_NAMEMASK (0x0fff)
@ -283,7 +287,7 @@ extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
extern struct alternate_object_database {
struct alternate_object_database *next;
char *name;
char base[0]; /* more */
char base[]; /* more */
} *alt_odb_list;
extern void prepare_alt_odb(void);
@ -296,7 +300,7 @@ extern struct packed_git {
unsigned int pack_last_used;
unsigned int pack_use_cnt;
unsigned char sha1[20];
char pack_name[0]; /* something like ".git/objects/pack/xxxxx.pack" */
char pack_name[]; /* something like ".git/objects/pack/xxxxx.pack" */
} *packed_git;
struct pack_entry {
@ -311,7 +315,7 @@ struct ref {
unsigned char new_sha1[20];
unsigned char force;
struct ref *peer_ref; /* when renaming */
char name[0];
char name[];
};
extern int git_connect(int fd[2], char *url, const char *prog);