Workarounds for compiling on MacOS X.
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
"Randal L. Schwartz" <merlyn@xxxxxxxxxxxxxx> wrote:
>
> gcc -o imap-send.o -c -g -O2 -Wall -I/sw/include -I/opt/local/include -DSHA1_HEADER='<openssl/sha.h>' imap-send.c
> imap-send.c:376: error: static declaration of 'vasprintf' follows non-static declaration
> /usr/include/stdio.h:297: error: previous declaration of 'vasprintf' was here
> make: *** [imap-send.o] Error 1
This should fix the build issues on Mac OS X. Not tested on other
(possibly) more important platforms, like Linux. :-)
generate-cmdlist.sh | 2 +-
imap-send.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
base 57f4a482a7fc31e31cafd31fe23f4a4779b2c2f0
last 6854050e1cdaf1b7ab352e1d4757ff5b29a5db93
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 6ee85d5..76ba49c 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -42,7 +42,7 @@ EOF
while read cmd
do
sed -n "/NAME/,/git-$cmd/H;
- \$ {x; s/.*git-$cmd - \\(.*\\)/ {\"$cmd\", \"\1\"},/; p}" \
+ \$ {x; s/.*git-$cmd - \\(.*\\)/ {\"$cmd\", \"\1\"},/; p;}" \
"Documentation/git-$cmd.txt"
done
echo "};"
diff --git a/imap-send.c b/imap-send.c
index fddaac0..376929f 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -370,7 +370,7 @@ free_generic_messages( message_t *msgs )
}
}
-static int
+int
vasprintf( char **strp, const char *fmt, va_list ap )
{
int len;
--
1.2.4.g806b
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html