From e132075738d6543956a8c3457ae1a9c87e9a587c Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 22 Jun 2012 18:31:29 +0200 Subject: [PATCH] unix: rename linux/core.c to linux/linux-core.c Newer versions of gyp do not support files with the same basenames (example: core.c and linux/core.c). The nominal reason is consistency across build systems. Apparently, msbuild doesn't support it either. Somewhere, someplace, baby Jesus cries sad little tears... Fixes #464. --- config-unix.mk | 4 +++- src/unix/linux/{core.c => linux-core.c} | 0 uv.gyp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename src/unix/linux/{core.c => linux-core.c} (100%) diff --git a/config-unix.mk b/config-unix.mk index 7220f108..0581b511 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -67,7 +67,9 @@ EIO_CONFIG=config_linux.h CSTDFLAG += -D_GNU_SOURCE CPPFLAGS += -Isrc/ares/config_linux LINKFLAGS+=-ldl -lrt -OBJS += src/unix/linux/core.o src/unix/linux/inotify.o src/unix/linux/syscalls.o +OBJS += src/unix/linux/linux-core.o \ + src/unix/linux/inotify.o \ + src/unix/linux/syscalls.o endif ifeq (FreeBSD,$(uname_S)) diff --git a/src/unix/linux/core.c b/src/unix/linux/linux-core.c similarity index 100% rename from src/unix/linux/core.c rename to src/unix/linux/linux-core.c diff --git a/uv.gyp b/uv.gyp index 5b9273ab..d7a34c2e 100644 --- a/uv.gyp +++ b/uv.gyp @@ -233,7 +233,7 @@ [ 'OS=="linux"', { 'include_dirs': [ 'src/ares/config_linux' ], 'sources': [ - 'src/unix/linux/core.c', + 'src/unix/linux/linux-core.c', 'src/unix/linux/inotify.c', 'src/unix/linux/syscalls.c', 'src/unix/linux/syscalls.h',