summaryrefslogtreecommitdiff
path: root/Utilities/cmlibuv
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-17 10:20:58 -0500
committerBrad King <brad.king@kitware.com>2019-01-17 10:27:14 -0500
commit1136275ae16cb0cc182e50f73d646445580b2634 (patch)
tree1fb4b42373edb860936c3e63a8d978e94d4b94e7 /Utilities/cmlibuv
parent1e1209729b26312cb511d5995bd57b6f5d35235e (diff)
downloadcmake-1136275ae16cb0cc182e50f73d646445580b2634.tar.gz
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.
Diffstat (limited to 'Utilities/cmlibuv')
-rw-r--r--Utilities/cmlibuv/include/uv/unix.h22
-rw-r--r--Utilities/cmlibuv/include/uv/win.h6
2 files changed, 14 insertions, 14 deletions
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 <pthread.h>
#include <signal.h>
-#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 <sys/stat.h>
#if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
#else
# include <stdint.h>
#endif
-#include "uv/tree.h"
-#include "uv/threadpool.h"
+#include "tree.h"
+#include "threadpool.h"
#define MAX_PIPENAME_LEN 256