Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2012-07-15 16:11:58 +0400
committerVicent Marti <tanoku@gmail.com>2012-07-15 16:32:51 +0400
commit227f31311979a2fdb1ffc8dbcb4cf0737e7bc899 (patch)
tree7cd5a31b4a39d4b28b5ebd218ab07291463253c6 /src/attr_file.c
parentd1af70b0509916abcb4724e0d8cdbee8ebf6bb2d (diff)
attr: Rename the `git_attr__` exports
Pevents collisions with the original libgit, which also exports those exact symbols. Fixes #822
Diffstat (limited to 'src/attr_file.c')
-rw-r--r--src/attr_file.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/attr_file.c b/src/attr_file.c
index ca2f8fb58..0dad09727 100644
--- a/src/attr_file.c
+++ b/src/attr_file.c
@@ -5,9 +5,9 @@
#include "git2/tree.h"
#include <ctype.h>
-const char *git_attr__true = "[internal]__TRUE__";
-const char *git_attr__false = "[internal]__FALSE__";
-const char *git_attr__unset = "[internal]__UNSET__";
+const char *git_l_attr__true = "[internal]__TRUE__";
+const char *git_l_attr__false = "[internal]__FALSE__";
+const char *git_l_attr__unset = "[internal]__UNSET__";
static int sort_by_hash_and_name(const void *a_raw, const void *b_raw);
static void git_attr_rule__clear(git_attr_rule *rule);
@@ -503,14 +503,14 @@ int git_attr_assignment__parse(
}
assign->name_hash = 5381;
- assign->value = git_attr__true;
+ assign->value = git_l_attr__true;
/* look for magic name prefixes */
if (*scan == '-') {
- assign->value = git_attr__false;
+ assign->value = git_l_attr__false;
scan++;
} else if (*scan == '!') {
- assign->value = git_attr__unset; /* explicit unspecified state */
+ assign->value = git_l_attr__unset; /* explicit unspecified state */
scan++;
} else if (*scan == '#') /* comment rest of line */
break;
@@ -546,7 +546,7 @@ int git_attr_assignment__parse(
}
/* expand macros (if given a repo with a macro cache) */
- if (repo != NULL && assign->value == git_attr__true) {
+ if (repo != NULL && assign->value == git_l_attr__true) {
git_attr_rule *macro =
git_attr_cache__lookup_macro(repo, assign->name);