diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index e3e9cb77d..d31d3c4b9 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -11,7 +11,6 @@ jobs: cc: gcc-9, cxx: g++-9, args: -DCMAKE_BUILD_TYPE=RelWithDebInfo, - nethost: nethost-linux, } - { name: windows, @@ -19,7 +18,6 @@ jobs: cc: cl, cxx: cl, args: -DCMAKE_BUILD_TYPE=RelWithDebInfo -A x64 -T host=x64, - nethost: nethost-windows, } fail-fast: false steps: diff --git a/src/asyncrt_utils.cpp b/src/asyncrt_utils.cpp index ffd16ad45..9bdb9f5ba 100644 --- a/src/asyncrt_utils.cpp +++ b/src/asyncrt_utils.cpp @@ -11,7 +11,7 @@ * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- ****/ -#include "pplx/stdafx.h" +#include "stdafx.h" #ifndef _WIN32 #if defined(__clang__) diff --git a/src/pplx.cpp b/src/pplx.cpp index 36f54565d..40c76fc3b 100644 --- a/src/pplx.cpp +++ b/src/pplx.cpp @@ -11,7 +11,7 @@ * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- ****/ -#include "pplx/stdafx.h" +#include "stdafx.h" #if !defined(_WIN32) || _MSC_VER < 1800 || CPPREST_FORCE_PPLX diff --git a/src/pplxapple.cpp b/src/pplxapple.cpp index 572d7f1f9..44c25f6b3 100644 --- a/src/pplxapple.cpp +++ b/src/pplxapple.cpp @@ -14,7 +14,7 @@ #include #include #include -#include "pplx/stdafx.h" +#include "stdafx.h" #include "pplx/pplx.h" // DEVNOTE: diff --git a/src/pplxlinux.cpp b/src/pplxlinux.cpp index 27adda1f0..b2dc524c8 100644 --- a/src/pplxlinux.cpp +++ b/src/pplxlinux.cpp @@ -11,7 +11,7 @@ * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- ****/ -#include "pplx/stdafx.h" +#include "stdafx.h" #include "pplx/pplx.h" #include "pplx/threadpool.h" #include "sys/syscall.h" diff --git a/src/pplxwin.cpp b/src/pplxwin.cpp index 84b47e833..2e378e08c 100644 --- a/src/pplxwin.cpp +++ b/src/pplxwin.cpp @@ -11,7 +11,7 @@ * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- ****/ -#include "pplx/stdafx.h" +#include "stdafx.h" #if !defined(_WIN32) || _MSC_VER < 1800 || CPPREST_FORCE_PPLX diff --git a/src/stdafx.cpp b/src/stdafx.cpp index fa3f0f059..189c9a00a 100644 --- a/src/stdafx.cpp +++ b/src/stdafx.cpp @@ -10,6 +10,6 @@ // stdafx.cpp : // Include the standard header and generate the precompiled header. -#include "pplx/stdafx.h" +#include "stdafx.h" diff --git a/include/pplx/stdafx.h b/src/stdafx.h similarity index 100% rename from include/pplx/stdafx.h rename to src/stdafx.h diff --git a/src/threadpool.cpp b/src/threadpool.cpp index 87a1386a3..7b35e6b7f 100644 --- a/src/threadpool.cpp +++ b/src/threadpool.cpp @@ -4,7 +4,7 @@ * * =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ **/ -#include "pplx/stdafx.h" +#include "stdafx.h" #if !defined(CPPREST_EXCLUDE_WEBSOCKETS) || !defined(_WIN32) #include "pplx/threadpool.h"