rexy712/frnetlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing compile errors on the MSVC compiler

Browse Source
This commit is contained in:
Fred Nicolson 2018-04-10 17:26:14 +01:00
parent bdc7235246
commit 0f14184bf6
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/frnetlib/NetworkEncoding.h
View File

@ -6,6 +6,7 @@
#define FRNETLIB_NETWORKENCODING_H #define FRNETLIB_NETWORKENCODING_H
#include <cstring> #include <cstring>
#include <string>
#include <cstdint> #include <cstdint>
#include <atomic> #include <atomic>
#include <exception> #include <exception>
@ -55,8 +56,6 @@
# define htonll(x) (x) # define htonll(x) (x)
# define ntohll(x) (x) # define ntohll(x) (x)
# endif # endif
#elif defined(_MSC_VER)
//MSVC has htonll and ntohll, no need to redefine
#else #else
# define htonll(x) ((1==htonl(1)) ? (x) : ((uint64_t)htonl((x) & 0xFFFFFFFF) << 32) | htonl((x) >> 32)) # define htonll(x) ((1==htonl(1)) ? (x) : ((uint64_t)htonl((x) & 0xFFFFFFFF) << 32) | htonl((x) >> 32))
# define ntohll(x) ((1==ntohl(1)) ? (x) : ((uint64_t)ntohl((x) & 0xFFFFFFFF) << 32) | ntohl((x) >> 32)) # define ntohll(x) ((1==ntohl(1)) ? (x) : ((uint64_t)ntohl((x) & 0xFFFFFFFF) << 32) | ntohl((x) >> 32))

1
include/frnetlib/WebFrame.h
View File

@ -6,6 +6,7 @@
#define FRNETLIB_WEBFRAME_H #define FRNETLIB_WEBFRAME_H
#include <ctime>
#include "Sendable.h" #include "Sendable.h"
namespace fr namespace fr

1
include/frnetlib/WebSocket.h
View File

@ -5,6 +5,7 @@
#ifndef FRNETLIB_WEBSOCKET_H #ifndef FRNETLIB_WEBSOCKET_H
#define FRNETLIB_WEBSOCKET_H #define FRNETLIB_WEBSOCKET_H
#include <ctime>
#include "frnetlib/Socket.h" #include "frnetlib/Socket.h"
#include "frnetlib/HttpRequest.h" #include "frnetlib/HttpRequest.h"
#include "frnetlib/HttpResponse.h" #include "frnetlib/HttpResponse.h"