From ccd9745a681f625a8fc41f27da086ba42eac5691 Mon Sep 17 00:00:00 2001 From: Logan Rosen Date: Wed, 17 Dec 2014 21:33:03 -0500 Subject: [PATCH 1/2] build: link against -pthread Please see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773341 for more information. Libuv uses some of pthread's symbols, but it doesn't link against it, which causes underlinking issues, especially in Ubuntu where we use ld --as-needed. The issue also shows up as warnings in Debian's build logs. PR-URL: https://github.com/libuv/libuv/pull/73 Reviewed-By: Ben Noordhuis --- config-unix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-unix.mk b/config-unix.mk index 37c4a72f6..c538555e0 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -22,7 +22,7 @@ E= CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter CFLAGS += -g CPPFLAGS += -I$(SRCDIR)/src -LDFLAGS=-lm +LDFLAGS=-lm -pthread CPPFLAGS += -D_LARGEFILE_SOURCE CPPFLAGS += -D_FILE_OFFSET_BITS=64 From 796425205b78b4ca8c62e3cb448249a5a84f7dc0 Mon Sep 17 00:00:00 2001 From: Kenneth Perry Date: Fri, 19 Dec 2014 07:24:43 -0600 Subject: [PATCH 2/2] win: scandir use 'ls' for formatting long strings PR-URL: https://github.com/libuv/libuv/pull/75/files Reviewed-By: Bert Belder --- src/win/fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/win/fs.c b/src/win/fs.c index 7f3704e8a..c5a4b2b70 100644 --- a/src/win/fs.c +++ b/src/win/fs.c @@ -732,9 +732,9 @@ void fs__readdir(uv_fs_t* req) { if (len == 0) { fmt = L"./*"; } else if (pathw[len - 1] == L'/' || pathw[len - 1] == L'\\') { - fmt = L"%s*"; + fmt = L"%ls*"; } else { - fmt = L"%s\\*"; + fmt = L"%ls\\*"; } /* Figure out whether path is a file or a directory. */