diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:34 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:34 +0900 |
| commit | ed8a45168924ac3e5c42fd30ecc32daac6e67d1b (patch) | |
| tree | 23447f81dd15d19df1c2459319c9aeaafa9b58cf | |
| parent | Merge branch 'js/rebase-i-label-shown-in-status-fix' (diff) | |
| parent | sha1dc: update from upstream (diff) | |
| download | git-ed8a45168924ac3e5c42fd30ecc32daac6e67d1b.tar.xz git-ed8a45168924ac3e5c42fd30ecc32daac6e67d1b.zip | |
Merge branch 'ab/sha1dc'
Update collision-detecting SHA-1 code to build properly on HP-UX.
* ab/sha1dc:
sha1dc: update from upstream
| m--------- | sha1collisiondetection | 0 | ||||
| -rw-r--r-- | sha1dc/sha1.c | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sha1collisiondetection b/sha1collisiondetection -Subproject 16033998da4b273aebd92c84b1e1b12e4aaf700 +Subproject 855827c583bc30645ba427885caa40c5b81764d diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c index 5931cf25d51..9d3cf81d4d7 100644 --- a/sha1dc/sha1.c +++ b/sha1dc/sha1.c @@ -93,7 +93,7 @@ #define SHA1DC_BIGENDIAN /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */ -#elif (defined(_AIX)) +#elif (defined(_AIX) || defined(__hpux)) /* * Defines Big Endian on a whitelist of OSs that are known to be Big |