diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-01-07 13:57:34 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-01-07 13:57:34 +0100 |
commit | 0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f (patch) | |
tree | d2593b129bf0e83d72937cf52e8a9283c85be46a /src/Server.h | |
parent | Merge branch 'master' of github.com:mc-server/MCServer (diff) | |
parent | Added Base64Encode(). (diff) | |
download | cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.gz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.bz2 cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.lz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.xz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.zst cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.zip |
Diffstat (limited to 'src/Server.h')
-rw-r--r-- | src/Server.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Server.h b/src/Server.h index 1f94bb3da..e62c4c7b7 100644 --- a/src/Server.h +++ b/src/Server.h @@ -11,9 +11,24 @@ #include "OSSupport/SocketThreads.h" #include "OSSupport/ListenThread.h" + +#include "RCONServer.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 + #include "cryptopp/rsa.h" #include "cryptopp/randpool.h" -#include "RCONServer.h" + +#ifdef _MSC_VER + #pragma warning(pop) +#endif |