Module: Mesa Branch: master Commit: 3b8ccca8a3b5e03829fba7cdb57b49fc10917954 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b8ccca8a3b5e03829fba7cdb57b49fc10917954
Author: Carl Worth <[email protected]> Date: Mon Jan 19 10:49:41 2015 -0800 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 --- src/util/Makefile.sources | 4 ++-- src/util/{sha1.c => mesa-sha1.c} | 2 +- src/util/{sha1.h => mesa-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 similarity index 99% rename from src/util/sha1.c rename to 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 similarity index 100% rename from src/util/sha1.h rename to src/util/mesa-sha1.h _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
