diff options
| author | Randall Spangler <rspangler@chromium.org> | 2010-08-23 13:20:07 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2010-08-23 13:20:07 -0700 |
| commit | 41656c082dac41132d6e9577a069c4f2360d1eca (patch) | |
| tree | 38a6644e4052c161b2da79f9a1bc3439d6f3e481 | |
| parent | 475bf447ccab91e11ddfc3445606d7debb3c71ed (diff) | |
| download | vboot-41656c082dac41132d6e9577a069c4f2360d1eca.tar.gz | |
Fix utility.c to compile on MSVC.
BUG=none
TEST=make && make runtests
Review URL: http://codereview.chromium.org/3186024
| -rw-r--r-- | firmware/lib/utility.c | 6 | ||||
| -rw-r--r-- | firmware/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/firmware/lib/utility.c b/firmware/lib/utility.c index 0ed9712e..3f3ed5d5 100644 --- a/firmware/lib/utility.c +++ b/firmware/lib/utility.c @@ -5,6 +5,7 @@ * Utility functions that need to be built as part of the firmware. */ +#include "sysincludes.h" #include "utility.h" void* Memset(void* d, const uint8_t c, uint64_t n) { @@ -16,12 +17,13 @@ void* Memset(void* d, const uint8_t c, uint64_t n) { } int SafeMemcmp(const void* s1, const void* s2, size_t n) { + const unsigned char* us1 = s1; + const unsigned char* us2 = s2; int result = 0; + if (0 == n) return 1; - const unsigned char* us1 = s1; - const unsigned char* us2 = s2; /* Code snippet without data-dependent branch due to * Nate Lawson (nate@root.org) of Root Labs. */ while (n--) diff --git a/firmware/version.c b/firmware/version.c index bf47bea8..35789a8e 100644 --- a/firmware/version.c +++ b/firmware/version.c @@ -1 +1 @@ -char* VbootVersion = "VBOOv=46f86fdc"; +char* VbootVersion = "VBOOv=866c0f20"; |