zlib: include "git2/types.h" instead of "common.h"

The zlib dependency includes "common.h" inside of the "zconf.h" header
to make available some type declarations like e.g. git_off_t. Including
the "common.h" header does pull in quite a lot of other headers though,
which are not required at all. Instead, we can just include our public
"git2/types.h" header, which is much more limited in its scope but still
provides everything required for "zconf.h".

This fix eases the transition later on to use a separate "features.h"
header instead of defines. As we have to generate the "features.h"
header, we put it in the build directory and add an include directory.
As we are splitting out building of dependencies into subdirectories,
this would mean that the zlib dependency needs to be aware of the parent
project's build directory, which is unfortunate. By including
"git2/types.h", we avoid this problem.
This commit is contained in:
Patrick Steinhardt
2017-06-30 19:24:15 +02:00
parent 459fb8fe4f
commit 9b0482e4d4

3
deps/zlib/zconf.h vendored
View File

@@ -8,7 +8,8 @@
#ifndef ZCONF_H
#define ZCONF_H
#include "../../src/common.h"
#include "../../include/git2/types.h"
#include <stdarg.h>
/* Jeez, don't complain about non-prototype
* forms, we didn't write zlib */