diff --git a/.gitmodules b/.gitmodules index 5132291b..28b9b149 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "extern/vector"] path = extern/vector - url = https://github.com/goldsborough/vector.git + url = https://github.com/flyfish30/vector.git [submodule "extern/libcsptr"] path = extern/libcsptr url = https://github.com/neugates/libcsptr.git diff --git a/extern/vector b/extern/vector index 40efe822..9ec1000b 160000 --- a/extern/vector +++ b/extern/vector @@ -1 +1 @@ -Subproject commit 40efe822562493396fc02cb13e75f6d52f0fb466 +Subproject commit 9ec1000b6a3d1680cdbd428d40043c5680029b34 diff --git a/include/vector.h b/include/vector.h index 334ee007..68b58fbf 100644 --- a/include/vector.h +++ b/include/vector.h @@ -135,7 +135,9 @@ size_t iterator_index(Vector* vector, Iterator* iterator); /***** PRIVATE *****/ +#ifndef MAX #define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif bool _vector_should_grow(Vector* vector); bool _vector_should_shrink(Vector* vector);