diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-02 12:36:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-02 12:36:10 -0700 |
| commit | 839fa9c500c7771d15831e2bcf77697cd70620f9 (patch) | |
| tree | 7a4bcbd1b38e6d487019dc1c4438897910e62d29 /Documentation/git-merge-one-file.txt | |
| parent | 3cf6bb34063406e107f51aa52db67d65839f5e58 (diff) | |
| download | git-839fa9c500c7771d15831e2bcf77697cd70620f9.tar.gz git-839fa9c500c7771d15831e2bcf77697cd70620f9.tar.xz | |
compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
The previous commit swaps the order we check the macros defined by
the compiler and the system headers from the original. Since the
order of check should not matter (i.e. it is insane to define both
__BIG_ENDIAN and friends and BIG_ENDIAN and friends and in a
conflicting way), it is the most conservative thing to do not to
change it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions