diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-09-07 00:06:51 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-09-07 00:18:12 -0400 |
| commit | ae535cb0bf86e3ae376d42f4fd064bb73c22427e (patch) | |
| tree | 003b0193607b8ee803baaff8a96c3075116a9b95 /src/util | |
| parent | 13bfa5201162185005fa9a45f7bc76e5909ab193 (diff) | |
| download | external_mesa3d-ae535cb0bf86e3ae376d42f4fd064bb73c22427e.zip external_mesa3d-ae535cb0bf86e3ae376d42f4fd064bb73c22427e.tar.gz external_mesa3d-ae535cb0bf86e3ae376d42f4fd064bb73c22427e.tar.bz2 | |
util: make mesa-sha1.c completely empty when there are no SHA1 impls
My earlier attempt to fix this missed the fact that there was a #else
clause that assumes that you have openssh. This moves the whole thing
under #ifdef HAVE_SHA1 which should avoid this issue.
Fixes: 13bfa5201 (util: always include sha1 into the build)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91898
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@gmail.com>
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/mesa-sha1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c index 7614b21..faa1c87 100644 --- a/src/util/mesa-sha1.c +++ b/src/util/mesa-sha1.c @@ -26,6 +26,8 @@ #include "mesa-sha1.h" +#ifdef HAVE_SHA1 + #if defined(HAVE_SHA1_IN_LIBMD) /* Use libmd for SHA1 */ \ || defined(HAVE_SHA1_IN_LIBC) /* Use libc for SHA1 */ @@ -290,8 +292,6 @@ _mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20]) #endif -#ifdef HAVE_SHA1 - void _mesa_sha1_compute(const void *data, size_t size, unsigned char result[20]) { |