  
  ifeq ($(USE_TCMALLOC),yes)
    ALLOD_DEPS=
-diff --git src/aof.c src/aof.c
+diff --git a/src/aof.c redis/src/aof.c
 index dbd0468..7a5d21f 100644
---- src/aof.c
-+++ src/aof.c
+--- a/src/aof.c
++++ redis/src/aof.c
 @@ -25,7 +25,7 @@ void stopAppendOnly(void) {
          int statloc;
  

             int exitcode = WEXITSTATUS(statloc);
             int bysignal = 0;
             
diff --git src/sha1.c src/sha1.c
index 26a5565..e90812e 100644
--- src/sha1.c
+++ src/sha1.c
@@ -27,6 +27,9 @@ A million repetitions of "a"
 #if defined(__sun)
 #include "solarisfixes.h"

 #include "sha1.h"
 #include "config.h"
 
diff --git a/src/util.c redis/src/util.c
index f5a23af..2a6d18d 100644
--- a/src/util.c
+++ redis/src/util.c
@@ -317,7 +317,7 @@ int d2string(char *buf, size_t len, double value) {
          * integer printing function that is much faster. */
         double min = -4503599627370495; /* (2^52)-1 */
