From 3065162ef57aaf77940d455fcaba2017e22ff6b1 Mon Sep 17 00:00:00 2001 From: "Dusan D. Majkic" Date: Sat, 14 Jan 2012 13:33:12 +0100 Subject: [PATCH] Renamed libhiredis.dll to hiredis.dll --- deps/hiredis/Makefile | 7 ++++--- deps/hiredis/net.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile index ba5a1551633..11fde5ee916 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile @@ -29,10 +29,11 @@ ifeq ($(uname_S),Darwin) else ifeq ($(osname),MINGW32_NT) CFLAGS?= -std=gnu99 -pedantic $(OPTIMIZATION) -Wall -W -D_ISOC99_SOURCE -D__USE_MINGW_ANSI_STDIO=1 -Wwrite-strings $(ARCH) $(PROF) CCLINK?= -mthreads - LIBS?= -lws2_32 - DYLIBNAME?=libhiredis.dll + LIBS?= -lws2_32 + LDFLAGS?=-L. + DYLIBNAME?=hiredis.dll DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ} ${LIBS} - STLIBNAME?=libhiredis.a + STLIBNAME?=hiredis.a STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} CC=gcc else diff --git a/deps/hiredis/net.c b/deps/hiredis/net.c index 265573e302d..936ec314c50 100644 --- a/deps/hiredis/net.c +++ b/deps/hiredis/net.c @@ -317,7 +317,7 @@ int redisContextConnectTcp(redisContext *c, const char *addr, int port, struct t he = gethostbyname(addr); if (he == NULL) { __redisSetError(c,REDIS_ERR_OTHER, - sdscatprintf(sdsempty(),"can't resolve: %s\n", addr)); + sdscatprintf(sdsempty(),"Can't resolve: %s", addr)); closesocket(s); return REDIS_ERR;; }