diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-06-30 13:39:01 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-07-03 08:51:48 +0000 |
| commit | 0c7f49dd4316b332f30b4ea72a657bace41e1245 (patch) | |
| tree | ce4e7b43e8dd32e9daf268cedca2414191f3e472 /src/hash | |
| parent | 2480d0eba85781c802027073a91f6f4331d4f71b (diff) | |
| download | libgit2-0c7f49dd4316b332f30b4ea72a657bace41e1245.tar.gz | |
Make sure to always include "common.h" first
Next to including several files, our "common.h" header also declares
various macros which are then used throughout the project. As such, we
have to make sure to always include this file first in all
implementation files. Otherwise, we might encounter problems or even
silent behavioural differences due to macros or defines not being
defined as they should be. So in fact, our header and implementation
files should make sure to always include "common.h" first.
This commit does so by establishing a common include pattern. Header
files inside of "src" will now always include "common.h" as its first
other file, separated by a newline from all the other includes to make
it stand out as special. There are two cases for the implementation
files. If they do have a matching header file, they will always include
this one first, leading to "common.h" being transitively included as
first file. If they do not have a matching header file, they instead
include "common.h" as first file themselves.
This fixes the outlined problems and will become our standard practice
for header and source files inside of the "src/" from now on.
Diffstat (limited to 'src/hash')
| -rw-r--r-- | src/hash/hash_generic.c | 4 | ||||
| -rw-r--r-- | src/hash/hash_generic.h | 2 | ||||
| -rw-r--r-- | src/hash/hash_win32.c | 4 | ||||
| -rw-r--r-- | src/hash/hash_win32.h | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/hash/hash_generic.c b/src/hash/hash_generic.c index 472a7a696..7b33b6194 100644 --- a/src/hash/hash_generic.c +++ b/src/hash/hash_generic.c @@ -5,9 +5,9 @@ * a Linking Exception. For full terms see the included COPYING file. */ -#include "common.h" +#include "hash_generic.h" + #include "hash.h" -#include "hash/hash_generic.h" #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) diff --git a/src/hash/hash_generic.h b/src/hash/hash_generic.h index daeb1cda8..114b60781 100644 --- a/src/hash/hash_generic.h +++ b/src/hash/hash_generic.h @@ -8,6 +8,8 @@ #ifndef INCLUDE_hash_generic_h__ #define INCLUDE_hash_generic_h__ +#include "common.h" + #include "hash.h" struct git_hash_ctx { diff --git a/src/hash/hash_win32.c b/src/hash/hash_win32.c index 6bae53e55..4d53a57bd 100644 --- a/src/hash/hash_win32.c +++ b/src/hash/hash_win32.c @@ -5,10 +5,10 @@ * a Linking Exception. For full terms see the included COPYING file. */ -#include "common.h" +#include "hash_win32.h" + #include "global.h" #include "hash.h" -#include "hash/hash_win32.h" #include <wincrypt.h> #include <strsafe.h> diff --git a/src/hash/hash_win32.h b/src/hash/hash_win32.h index 2eee5ca79..187c07267 100644 --- a/src/hash/hash_win32.h +++ b/src/hash/hash_win32.h @@ -9,6 +9,7 @@ #define INCLUDE_hash_win32_h__ #include "common.h" + #include "hash.h" #include <wincrypt.h> |
