diff options
| author |  Sadie Powell | 2022-01-26 13:23:46 +0000 |
|---|---|---|
| committer | Sadie Powell | 2022-01-26 15:34:17 +0000 |
| commit | d7a7f37d14fd4433309fd2d2fae26916a1b60aee (patch) | |
| tree | 129ccfe97d88a850004b32eaec05c1782b3ea5d7 /src/modules | |
| parent | Replace consolecolors with a vendored library. (diff) | |
Kill vendor_directory in favour of normal include paths.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_bcrypt.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_httpd.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_sha2.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_websocket.cpp | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp index c6615a728..17bd9e072 100644 --- a/src/modules/m_bcrypt.cpp +++ b/src/modules/m_bcrypt.cpp @@ -17,13 +17,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -isystem vendor_directory("bcrypt") - #include "inspircd.h" #include "modules/hash.h" -#include <crypt_blowfish.c> +#include <bcrypt/crypt_blowfish.c> class BCryptProvider final : public HashProvider diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 6035c62d1..8bce18626 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -26,8 +26,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -isystem vendor_directory("http_parser") - #include "inspircd.h" #include "iohook.h" @@ -42,7 +40,7 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#include <http_parser.c> +#include <http_parser/http_parser.c> #ifdef __GNUC__ # pragma GCC diagnostic pop diff --git a/src/modules/m_sha2.cpp b/src/modules/m_sha2.cpp index c68c579b9..7d85d5a8e 100644 --- a/src/modules/m_sha2.cpp +++ b/src/modules/m_sha2.cpp @@ -23,8 +23,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -isystem vendor_directory("sha2") - // Fix a collision between the Haiku uint64 typedef and the // one from the sha2 library. @@ -32,7 +30,7 @@ # define uint64 sha2_uint64 #endif -#include <sha2.c> +#include <sha2/sha2.c> #ifdef __HAIKU__ # undef uint64 diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index 071c5c2f2..3e3794e82 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -18,15 +18,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -isystem vendor_directory("utfcpp") - #include "inspircd.h" #include "iohook.h" #include "modules/hash.h" #define UTF_CPP_CPLUSPLUS 199711L -#include <unchecked.h> +#include <utfcpp/unchecked.h> static constexpr char MagicGUID[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; static constexpr char newline[] = "\r\n"; |