diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-08-29 02:51:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-29 02:51:25 +0200 |
commit | ee8419701472be9f24c51a41ee7b7ef3cf38f329 (patch) | |
tree | b689d4657ec4bb2de7e47f43f670e99b564f85a7 /src/Protocol/Protocol_1_9.h | |
parent | Store and pass entity effect duration as an int not a short. (#4293) (diff) | |
download | cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.gz cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.bz2 cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.lz cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.xz cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.zst cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.zip |
Diffstat (limited to 'src/Protocol/Protocol_1_9.h')
-rw-r--r-- | src/Protocol/Protocol_1_9.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Protocol/Protocol_1_9.h b/src/Protocol/Protocol_1_9.h index ee29775f1..d43c2bf09 100644 --- a/src/Protocol/Protocol_1_9.h +++ b/src/Protocol/Protocol_1_9.h @@ -22,21 +22,8 @@ Declares the 1.9 protocol classes: #include "Protocol.h" #include "../ByteBuffer.h" -#ifdef _MSC_VER - #pragma warning(push) - #pragma warning(disable:4127) - #pragma warning(disable:4244) - #pragma warning(disable:4231) - #pragma warning(disable:4189) - #pragma warning(disable:4702) -#endif - -#ifdef _MSC_VER - #pragma warning(pop) -#endif - -#include "mbedTLS++/AesCfb128Decryptor.h" -#include "mbedTLS++/AesCfb128Encryptor.h" +#include "../mbedTLS++/AesCfb128Decryptor.h" +#include "../mbedTLS++/AesCfb128Encryptor.h" |