diff options
| -rw-r--r-- | src/common.h | 3 | ||||
| -rw-r--r-- | src/fileops.h | 3 | ||||
| -rw-r--r-- | tests/t0001-errno.c | 1 | ||||
| -rw-r--r-- | tests/t0020-dirent.c | 1 | ||||
| -rw-r--r-- | tests/t0101-oid.c | 1 | ||||
| -rw-r--r-- | tests/t0201-existsloose.c | 1 | ||||
| -rw-r--r-- | tests/t0202-readloose.c | 1 | ||||
| -rw-r--r-- | tests/t0203-readloose.c | 1 | ||||
| -rw-r--r-- | tests/test_helpers.c | 1 | ||||
| -rw-r--r-- | tests/test_lib.c | 5 | ||||
| -rw-r--r-- | tests/test_lib.h | 7 |
11 files changed, 11 insertions, 14 deletions
diff --git a/src/common.h b/src/common.h index a73891d7c..5cb9d1b56 100644 --- a/src/common.h +++ b/src/common.h @@ -1,6 +1,9 @@ #ifndef INCLUDE_common_h__ #define INCLUDE_common_h__ +/** Force 64 bit off_t size on POSIX. */ +#define _FILE_OFFSET_BITS 64 + #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__) #define GIT_WIN32 1 #endif diff --git a/src/fileops.h b/src/fileops.h index 02e4e5bb2..98fffeb84 100644 --- a/src/fileops.h +++ b/src/fileops.h @@ -6,9 +6,6 @@ #ifndef INCLUDE_fileops_h__ #define INCLUDE_fileops_h__ -/** Force 64 bit off_t size on POSIX. */ -#define _FILE_OFFSET_BITS 64 - #include "common.h" #include "map.h" #include "dir.h" diff --git a/tests/t0001-errno.c b/tests/t0001-errno.c index dba81bc59..01768b00b 100644 --- a/tests/t0001-errno.c +++ b/tests/t0001-errno.c @@ -1,6 +1,5 @@ #include "test_lib.h" #include "errors.h" -#include <string.h> BEGIN_TEST(errno_zero_on_init) must_be_true(git_errno == 0); diff --git a/tests/t0020-dirent.c b/tests/t0020-dirent.c index 966f3c578..a2e130b3f 100644 --- a/tests/t0020-dirent.c +++ b/tests/t0020-dirent.c @@ -1,4 +1,3 @@ -#include <stdarg.h> #include "test_lib.h" #include "fileops.h" diff --git a/tests/t0101-oid.c b/tests/t0101-oid.c index 65654b679..4711d372e 100644 --- a/tests/t0101-oid.c +++ b/tests/t0101-oid.c @@ -1,6 +1,5 @@ #include "test_lib.h" #include <git/oid.h> -#include <stdlib.h> BEGIN_TEST(oid_szs) git_oid out; diff --git a/tests/t0201-existsloose.c b/tests/t0201-existsloose.c index 004393eb8..76f293894 100644 --- a/tests/t0201-existsloose.c +++ b/tests/t0201-existsloose.c @@ -1,7 +1,6 @@ #include "test_lib.h" #include "test_helpers.h" #include <git/odb.h> -#include "fileops.h" static char *odb_dir = "test-objects"; diff --git a/tests/t0202-readloose.c b/tests/t0202-readloose.c index e33a4bd5f..6e9fb9dad 100644 --- a/tests/t0202-readloose.c +++ b/tests/t0202-readloose.c @@ -2,7 +2,6 @@ #include "test_lib.h" #include "test_helpers.h" #include <git/odb.h> -#include "fileops.h" /* * read loose objects from the object directory. The objects are diff --git a/tests/t0203-readloose.c b/tests/t0203-readloose.c index 0bf364b35..77bad856f 100644 --- a/tests/t0203-readloose.c +++ b/tests/t0203-readloose.c @@ -2,7 +2,6 @@ #include "test_lib.h" #include "test_helpers.h" #include <git/odb.h> -#include "fileops.h" /* * read loose objects from the object directory. The objects are diff --git a/tests/test_helpers.c b/tests/test_helpers.c index edc21d065..6829e2c49 100644 --- a/tests/test_helpers.c +++ b/tests/test_helpers.c @@ -23,6 +23,7 @@ * Boston, MA 02110-1301, USA. */ +#include "common.h" #include "test_helpers.h" #include "fileops.h" diff --git a/tests/test_lib.c b/tests/test_lib.c index 06a1c29eb..9475785cf 100644 --- a/tests/test_lib.c +++ b/tests/test_lib.c @@ -23,10 +23,7 @@ * Boston, MA 02110-1301, USA. */ -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> +#define GIT__NO_HIDE_MALLOC #include "test_lib.h" struct test_info diff --git a/tests/test_lib.h b/tests/test_lib.h index 8e9d2f904..f863bba4d 100644 --- a/tests/test_lib.h +++ b/tests/test_lib.h @@ -23,9 +23,14 @@ * Boston, MA 02110-1301, USA. */ -#include <stdio.h> +#include "common.h" #include <git/common.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> + /** Declare a function never returns to the caller. */ #ifdef __GNUC__ # define NORETURN __attribute__((__noreturn__)) |