strmap: remove GIT__USE_STRMAP macro

diff --git a/src/attr.c b/src/attr.c
index 4023526e5848a5141cb297e926cb2afbba124e81..999f413181d527b10c77dd1588eacdaddeaeb3cd 100644 (file)
--- a/src/attr.c
+++ b/src/attr.c
@@ -7,8 +7,6 @@
 #include "git2/oid.h"
 #include <ctype.h>
 
-GIT__USE_STRMAP
-
 const char *git_attr__true  = "[internal]__TRUE__";
 const char *git_attr__false = "[internal]__FALSE__";
 const char *git_attr__unset = "[internal]__UNSET__";

diff --git a/src/attrcache.c b/src/attrcache.c
index 8860d77b14bd3d0c0272868347eee1eefbb4d15e..6cac14bc315a260b8eed66da9fb5ea39ba4f5ab2 100644 (file)
--- a/src/attrcache.c
+++ b/src/attrcache.c
@@ -5,8 +5,6 @@
 #include "sysdir.h"
 #include "ignore.h"
 
-GIT__USE_STRMAP
-
 GIT_INLINE(int) attr_cache_lock(git_attr_cache *cache)
 {
        GIT_UNUSED(cache); /* avoid warning if threading is off */

diff --git a/src/checkout.c b/src/checkout.c
index b70d5ab354628cb96f57a7e992aba51c5df64715..af600da6c36d7b4e2e3cfb9a64b8d89edb73ed2e 100644 (file)
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -35,8 +35,6 @@
 #include "pool.h"
 #include "strmap.h"
 
-GIT__USE_STRMAP
-
 /* See docs/checkout-internals.md for more information */
 
 enum {

diff --git a/src/config_file.c b/src/config_file.c
index 6a37389057767fdee21cf73b73abda4755f59aa9..cd5727c059bc81382c09c8edd66be43fe05b8a7d 100644 (file)
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -21,8 +21,6 @@
 #include <sys/types.h>
 #include <regex.h>
 
-GIT__USE_STRMAP
-
 typedef struct cvar_t {
        struct cvar_t *next;
        git_config_entry *entry;

diff --git a/src/diff_driver.c b/src/diff_driver.c
index 721388bb91ade79e6315f1df5f78c044c4dfb796..9109f315509bdc4549929e5c3454381ff8c532a4 100644 (file)
--- a/src/diff_driver.c
+++ b/src/diff_driver.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #include "repository.h"
 
-GIT__USE_STRMAP
-
 typedef enum {
        DIFF_DRIVER_AUTO = 0,
        DIFF_DRIVER_BINARY = 1,

diff --git a/src/fileops.c b/src/fileops.c
index 0b0ed42be993af8d6c02535fbe024fafbce54f90..57dea8fce6c4b4765e2e5fbcebf7e05b6aaf61ca 100644 (file)
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -13,8 +13,6 @@
 #include "win32/findfile.h"
 #endif
 
-GIT__USE_STRMAP
-
 int git_futils_mkpath2file(const char *file_path, const mode_t mode)
 {
        return git_futils_mkdir(

diff --git a/src/mwindow.c b/src/mwindow.c
index 91dbcae7f5a63afc1c16cac67f82f39420fe8e39..7bb9dbbe2a332143ac77856794621ce9c6ac08f1 100644 (file)
--- a/src/mwindow.c
+++ b/src/mwindow.c
@@ -14,8 +14,6 @@
 #include "strmap.h"
 #include "pack.h"
 
-GIT__USE_STRMAP
-
 #define DEFAULT_WINDOW_SIZE \
        (sizeof(void*) >= 8 \
                ? 1 * 1024 * 1024 * 1024 \

diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index def5302de1df5ff3eb053602fe4264a124b573e9..e2a69d6edb4a77a7c0f31b073b4c20e6167df60c 100644 (file)
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -26,8 +26,6 @@
 #include <git2/sys/refs.h>
 #include <git2/sys/reflog.h>
 
-GIT__USE_STRMAP
-
 #define DEFAULT_NESTING_LEVEL  5
 #define MAX_NESTING_LEVEL              10
 

diff --git a/src/refs.c b/src/refs.c
index 140b175afbb4dd0a58f7941af0f5372ce0e8da5f..70f5519c6199a7b315c479094e152331ceac33a1 100644 (file)
--- a/src/refs.c
+++ b/src/refs.c
@@ -26,8 +26,6 @@
 
 bool git_reference__enable_symbolic_ref_target_validation = true;
 
-GIT__USE_STRMAP
-
 #define DEFAULT_NESTING_LEVEL  5
 #define MAX_NESTING_LEVEL              10
 

diff --git a/src/repository.c b/src/repository.c
index 4b937be20d23944dfe97860faba64cb9744365c9..0db481638b135a1f69f3aee63c2aeca7b097e7bd 100644 (file)
--- a/src/repository.c
+++ b/src/repository.c
@@ -30,7 +30,6 @@
 #include "submodule.h"
 #include "worktree.h"
 
-GIT__USE_STRMAP
 #include "strmap.h"
 
 #ifdef GIT_WIN32

diff --git a/src/sortedcache.c b/src/sortedcache.c
index 20e137e911f31471c1f193cf7c877e4a882e6a1f..cc322d4784ffa8b9da73fdf09265961681609114 100644 (file)
--- a/src/sortedcache.c
+++ b/src/sortedcache.c
@@ -1,7 +1,5 @@
 #include "sortedcache.h"
 
-GIT__USE_STRMAP
-
 int git_sortedcache_new(
        git_sortedcache **out,
        size_t item_path_offset,

diff --git a/src/strmap.c b/src/strmap.c
index 09ace0fce0ae3523812052da4e050c2ddab3b7f2..678d98344b97a02709001a1bba4911819b271802 100644 (file)
--- a/src/strmap.c
+++ b/src/strmap.c
@@ -7,7 +7,7 @@
 
 #include "strmap.h"
 
-GIT__USE_STRMAP
+__KHASH_IMPL(str, static kh_inline, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
 
 int git_strmap_alloc(git_strmap **map)
 {

diff --git a/src/strmap.h b/src/strmap.h
index 2c898e00b540f6bdcecc11883d3c3f8b2dfcb4d0..389702c9bc2b2b1f2b1c435bb4cabe18f7866f1f 100644 (file)
--- a/src/strmap.h
+++ b/src/strmap.h
@@ -20,9 +20,6 @@ __KHASH_TYPE(str, const char *, void *)
 typedef khash_t(str) git_strmap;
 typedef khiter_t git_strmap_iter;
 
-#define GIT__USE_STRMAP \
-       __KHASH_IMPL(str, static kh_inline, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
-
 int git_strmap_alloc(git_strmap **map);
 
 #define git_strmap_free(h) git_strmap__free(h); (h) = NULL

diff --git a/src/transaction.c b/src/transaction.c
index 5b345e1a9d5412da5d66f31b1bc2d74cac031df4..3d3f35a03b49ac76ad7f389ec9a8c828933de177 100644 (file)
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -19,8 +19,6 @@
 #include "git2/sys/refs.h"
 #include "git2/sys/refdb_backend.h"
 
-GIT__USE_STRMAP
-
 typedef enum {
        TRANSACTION_NONE,
        TRANSACTION_REFS,

diff --git a/src/tree.c b/src/tree.c
index 8f4cab81483b79a4697250e83581149c65c8efa8..dba2060c36946229dda2cc14221ffd0459c612f5 100644 (file)
--- a/src/tree.c
+++ b/src/tree.c
@@ -20,8 +20,6 @@
 #define TREE_ENTRY_CHECK_NAMELEN(n) \
        if (n > UINT16_MAX) { giterr_set(GITERR_INVALID, "tree entry path too long"); }
 
-GIT__USE_STRMAP
-
 static bool valid_filemode(const int filemode)
 {
        return (filemode == GIT_FILEMODE_TREE

diff --git a/tests/core/strmap.c b/tests/core/strmap.c
index 860f1109b2104574c98bd3ba408eaf341dc83868..2fa594d435c19d23cc999d83b7f521b47accc4b2 100644 (file)
--- a/tests/core/strmap.c
+++ b/tests/core/strmap.c
@@ -1,8 +1,6 @@
 #include "clar_libgit2.h"
 #include "strmap.h"
 
-GIT__USE_STRMAP
-
 git_strmap *g_table;
 
 void test_core_strmap__initialize(void)