projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge refs/heads/master from .
[git.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index
9964667
..
d407f39
100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-38,11
+38,10
@@
#define NORETURN __attribute__((__noreturn__))
#else
#define NORETURN
#define NORETURN __attribute__((__noreturn__))
#else
#define NORETURN
-#endif
-
#ifndef __attribute__
#define __attribute__(x)
#endif
#ifndef __attribute__
#define __attribute__(x)
#endif
+#endif
/*
* Intensive research over the course of many years has shown that
/*
* Intensive research over the course of many years has shown that
@@
-59,7
+58,11
@@
* We accept older names for now but warn.
*/
extern char *gitenv_bc(const char *);
* We accept older names for now but warn.
*/
extern char *gitenv_bc(const char *);
+#ifdef __GNUC__
#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
#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
/*
* Basic data structures for the directory cache
@@
-101,7
+104,7
@@
struct cache_entry {
unsigned int ce_size;
unsigned char sha1[20];
unsigned short ce_flags;
unsigned int ce_size;
unsigned char sha1[20];
unsigned short ce_flags;
- char name[
0
];
+ char name[];
};
#define CE_NAMEMASK (0x0fff)
};
#define CE_NAMEMASK (0x0fff)
@@
-284,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;
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);
} *alt_odb_list;
extern void prepare_alt_odb(void);
@@
-297,7
+300,7
@@
extern struct packed_git {
unsigned int pack_last_used;
unsigned int pack_use_cnt;
unsigned char sha1[20];
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 {
} *packed_git;
struct pack_entry {
@@
-310,8
+313,9
@@
struct ref {
struct ref *next;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
struct ref *next;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
+ unsigned char force;
struct ref *peer_ref; /* when renaming */
struct ref *peer_ref; /* when renaming */
- char name[
0
];
+ char name[];
};
extern int git_connect(int fd[2], char *url, const char *prog);
};
extern int git_connect(int fd[2], char *url, const char *prog);