diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-12 11:42:31 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-03-11 02:36:11 +0100 |
commit | b63b76e0b0b658dff328e0d9e109ce040830786c (patch) | |
tree | 1c7ed9c1c0c6df008f10df0bd7feecc0e77631b3 | |
parent | c23f90053ddc10e7dbf0f99aabd5e13b0f317a42 (diff) | |
download | libgit2-b63b76e0b0b658dff328e0d9e109ce040830786c.tar.gz |
Reorder some khash declarations
Keep the definitions in the headers, while putting the declarations in
the C files. Putting the function definitions in headers causes
them to be duplicated if you include two headers with them.
-rw-r--r-- | src/describe.c | 2 | ||||
-rw-r--r-- | src/indexer.c | 2 | ||||
-rw-r--r-- | src/pack-objects.c | 2 | ||||
-rw-r--r-- | src/pack.c | 3 | ||||
-rw-r--r-- | src/pack.h | 4 | ||||
-rw-r--r-- | src/revwalk.c | 2 | ||||
-rw-r--r-- | src/revwalk.h | 2 |
7 files changed, 13 insertions, 4 deletions
diff --git a/src/describe.c b/src/describe.c index d4c0dea78..68bac2d2f 100644 --- a/src/describe.c +++ b/src/describe.c @@ -19,6 +19,8 @@ #include "vector.h" #include "repository.h" +GIT__USE_OIDMAP; + /* Ported from https://github.com/git/git/blob/89dde7882f71f846ccd0359756d27bebc31108de/builtin/describe.c */ struct commit_name { diff --git a/src/indexer.c b/src/indexer.c index 92f85c167..7521f0300 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -18,6 +18,8 @@ #include "oidmap.h" #include "zstream.h" +GIT__USE_OIDMAP; + extern git_mutex git__mwindow_mutex; #define UINT31_MAX (0x7FFFFFFF) diff --git a/src/pack-objects.c b/src/pack-objects.c index f644520ac..28fddf732 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -39,6 +39,8 @@ struct pack_write_context { git_transfer_progress *stats; }; +GIT__USE_OIDMAP; + #ifdef GIT_THREADS #define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \ diff --git a/src/pack.c b/src/pack.c index 3c646b778..5d0a27b91 100644 --- a/src/pack.c +++ b/src/pack.c @@ -16,6 +16,9 @@ #include <zlib.h> +GIT__USE_OFFMAP; +GIT__USE_OIDMAP; + static int packfile_open(struct git_pack_file *p); static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n); int packfile_unpack_compressed( diff --git a/src/pack.h b/src/pack.h index 3cebd10ac..b3d5b2993 100644 --- a/src/pack.h +++ b/src/pack.h @@ -71,9 +71,7 @@ struct pack_chain_elem { typedef git_array_t(struct pack_chain_elem) git_dependency_chain; #include "offmap.h" - -GIT__USE_OFFMAP -GIT__USE_OIDMAP +#include "oidmap.h" #define GIT_PACK_CACHE_MEMORY_LIMIT 16 * 1024 * 1024 #define GIT_PACK_CACHE_SIZE_LIMIT 1024 * 1024 /* don't bother caching anything over 1MB */ diff --git a/src/revwalk.c b/src/revwalk.c index 2ba000c6b..a6d823ec8 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -14,6 +14,8 @@ #include "git2/revparse.h" #include "merge.h" +GIT__USE_OIDMAP; + git_commit_list_node *git_revwalk__commit_lookup( git_revwalk *walk, const git_oid *oid) { diff --git a/src/revwalk.h b/src/revwalk.h index 1148a2ac9..6b363d40f 100644 --- a/src/revwalk.h +++ b/src/revwalk.h @@ -14,7 +14,7 @@ #include "pool.h" #include "vector.h" -GIT__USE_OIDMAP +#include "oidmap.h" struct git_revwalk { git_repository *repo; |