提交 bfb15365 编写于 作者: J Johannes Schindelin 提交者: Junio C Hamano

[PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X

On older Mac OS X (10.2.8), no socklen_t is defined, and therefore
daemon.c does not compile. However, Mac OS X 10.4 seems to define
socklen_t differently.

Also, linking fails due to some symbols defined in libssl (not just
libcrypto).

[jc: I am tentatively dropping the socklen_t part of the patch
because I am waiting for confirmation on the server side IPV6
patch from Yoshifuji-san]
Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 148519b7
......@@ -95,9 +95,13 @@ ifdef PPC_SHA1
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
else
SHA1_HEADER=<openssl/sha.h>
ifeq ($(shell uname -s),Darwin)
LIBS += -lcrypto -lssl
else
LIBS += -lcrypto
endif
endif
endif
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册