From 9b8834158bb173bc7e28413f0d6883b089230b58 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Thu, 20 May 2010 12:33:33 +0200 Subject: [PATCH] fix compile error on solaris --- mkreleasehdr.sh | 6 +++--- solarisfixes.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mkreleasehdr.sh b/mkreleasehdr.sh index c458e6480..45f5173a4 100755 --- a/mkreleasehdr.sh +++ b/mkreleasehdr.sh @@ -1,9 +1,9 @@ #!/bin/sh -GIT_SHA1=$( (git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1) -GIT_DIRTY=$(git diff 2> /dev/null | wc -l) +GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` +GIT_DIRTY=`git diff 2> /dev/null | wc -l` test -f release.h || touch release.h (cat release.h | grep SHA1 | grep $GIT_SHA1) && \ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate echo "#define REDIS_GIT_SHA1 \"$GIT_SHA1\"" > release.h echo "#define REDIS_GIT_DIRTY \"$GIT_DIRTY\"" >> release.h -touch redis.c # force recompile of redis.c +touch redis.c # Force recompile of redis.c diff --git a/solarisfixes.h b/solarisfixes.h index 5be2b647c..ce8e7b6fd 100644 --- a/solarisfixes.h +++ b/solarisfixes.h @@ -17,4 +17,5 @@ __builtin_expect(!isnan(__x_i) && !isfinite(__x_i), 0); }) #define u_int uint +#define u_int32_t uint32_t #endif /* __GNUC__ */