From 1136275ae16cb0cc182e50f73d646445580b2634 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 17 Jan 2019 10:20:58 -0500 Subject: libuv: Include uv/ headers from each other without any path Headers in `uv/` can include each other without the `uv/` prefix. Using the prefix assumes that the location of `uv/` is in the include file search path, but it is possible to include `uv.h` via a longer path. --- Utilities/cmlibuv/include/uv/unix.h | 22 +++++++++++----------- Utilities/cmlibuv/include/uv/win.h | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'Utilities/cmlibuv') diff --git a/Utilities/cmlibuv/include/uv/unix.h b/Utilities/cmlibuv/include/uv/unix.h index d10c9bdda0..3c1b363694 100644 --- a/Utilities/cmlibuv/include/uv/unix.h +++ b/Utilities/cmlibuv/include/uv/unix.h @@ -42,32 +42,32 @@ #include #include -#include "uv/threadpool.h" +#include "threadpool.h" #ifdef CMAKE_BOOTSTRAP -# include "uv/posix.h" +# include "posix.h" #elif defined(__linux__) -# include "uv/linux.h" +# include "linux.h" #elif defined (__MVS__) -# include "uv/os390.h" +# include "os390.h" #elif defined(__PASE__) -# include "uv/posix.h" +# include "posix.h" #elif defined(_AIX) -# include "uv/aix.h" +# include "aix.h" #elif defined(__sun) -# include "uv/sunos.h" +# include "sunos.h" #elif defined(__APPLE__) -# include "uv/darwin.h" +# include "darwin.h" #elif defined(__DragonFly__) || \ defined(__FreeBSD__) || \ defined(__FreeBSD_kernel__) || \ defined(__OpenBSD__) || \ defined(__NetBSD__) -# include "uv/bsd.h" +# include "bsd.h" #elif defined(__CYGWIN__) || defined(__MSYS__) -# include "uv/posix.h" +# include "posix.h" #elif defined(__GNU__) -# include "uv/posix.h" +# include "posix.h" #endif #ifndef NI_MAXHOST diff --git a/Utilities/cmlibuv/include/uv/win.h b/Utilities/cmlibuv/include/uv/win.h index ff24ea02cc..f3d3809f38 100644 --- a/Utilities/cmlibuv/include/uv/win.h +++ b/Utilities/cmlibuv/include/uv/win.h @@ -54,13 +54,13 @@ typedef struct pollfd { #include #if defined(_MSC_VER) && _MSC_VER < 1600 -# include "uv/stdint-msvc2008.h" +# include "stdint-msvc2008.h" #else # include #endif -#include "uv/tree.h" -#include "uv/threadpool.h" +#include "tree.h" +#include "threadpool.h" #define MAX_PIPENAME_LEN 256 -- cgit v1.2.1