aboutsummaryrefslogtreecommitdiffstats
path: root/vcs-svn/string_pool.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-22 15:30:33 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-22 15:30:33 -0800
commit35726681d5fd6bde44a18b4aec3cf04258d0b44e (patch)
tree217b0c1e4d7ab8c160451be5ad42711f46602bfc /vcs-svn/string_pool.c
parentMerge branch 'tr/doc-sh-setup' (diff)
parentAppease Sun Studio by renaming "tmpfile" (diff)
downloadgit-35726681d5fd6bde44a18b4aec3cf04258d0b44e.tar.gz
git-35726681d5fd6bde44a18b4aec3cf04258d0b44e.zip
Merge branch 'ab/sun-studio-portability'
* ab/sun-studio-portability: Appease Sun Studio by renaming "tmpfile" Fix a bitwise negation assignment issue spotted by Sun Studio Fix an enum assignment issue spotted by Sun Studio
Diffstat (limited to 'vcs-svn/string_pool.c')
-rw-r--r--vcs-svn/string_pool.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcs-svn/string_pool.c b/vcs-svn/string_pool.c
index 8af8d54d6e..1b63b19a38 100644
--- a/vcs-svn/string_pool.c
+++ b/vcs-svn/string_pool.c
@@ -8,7 +8,7 @@
#include "obj_pool.h"
#include "string_pool.h"
-static struct trp_root tree = { ~0 };
+static struct trp_root tree = { ~0U };
struct node {
uint32_t offset;
@@ -78,7 +78,7 @@ void pool_print_seq(uint32_t len, uint32_t *seq, char delim, FILE *stream)
uint32_t pool_tok_seq(uint32_t sz, uint32_t *seq, const char *delim, char *str)
{
char *context = NULL;
- uint32_t token = ~0;
+ uint32_t token = ~0U;
uint32_t length;
if (sz == 0)