diff options
| author | Carl Worth <cworth@cworth.org> | 2015-01-19 10:49:41 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2015-01-19 10:53:07 -0800 |
| commit | 3b8ccca8a3b5e03829fba7cdb57b49fc10917954 (patch) | |
| tree | bc3a4fca37491da6494e0080abee003b3116b99b | |
| parent | 7a182d233542889ea9e3f8091eaab0a2386f90fc (diff) | |
| download | external_mesa3d-3b8ccca8a3b5e03829fba7cdb57b49fc10917954.zip external_mesa3d-3b8ccca8a3b5e03829fba7cdb57b49fc10917954.tar.gz external_mesa3d-3b8ccca8a3b5e03829fba7cdb57b49fc10917954.tar.bz2 | |
Rename sha1.c and sha1.h to mesa-sha1.c and mesa-sha1.h
The filename of sha1.h was conflicting with the system-provided
sha1.h, (and in some confiurations, our sha1.c was unsuccessfully
attemping to include "sha1.h" and <sha1.h> as two different files).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88523
| -rw-r--r-- | src/util/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/util/mesa-sha1.c (renamed from src/util/sha1.c) | 2 | ||||
| -rw-r--r-- | src/util/mesa-sha1.h (renamed from src/util/sha1.h) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 52ae5cc..5ec3fe1 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -1,6 +1,6 @@ MESA_UTIL_SHADER_CACHE_FILES := \ - sha1.c \ - sha1.h + mesa-sha1.c \ + mesa-sha1.h MESA_UTIL_FILES := \ format_srgb.h \ diff --git a/src/util/sha1.c b/src/util/mesa-sha1.c index 27ba93b..fa28193 100644 --- a/src/util/sha1.c +++ b/src/util/mesa-sha1.c @@ -24,7 +24,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "sha1.h" +#include "mesa-sha1.h" #if defined(HAVE_SHA1_IN_LIBMD) /* Use libmd for SHA1 */ \ || defined(HAVE_SHA1_IN_LIBC) /* Use libc for SHA1 */ diff --git a/src/util/sha1.h b/src/util/mesa-sha1.h index 1599405..1599405 100644 --- a/src/util/sha1.h +++ b/src/util/mesa-sha1.h |