Skip to content

Commit

Permalink
Added windows support
Browse files Browse the repository at this point in the history
  • Loading branch information
Lichtso committed Feb 26, 2014
1 parent cb28081 commit 48685b3
Show file tree
Hide file tree
Showing 12 changed files with 1,736 additions and 1,626 deletions.
63 changes: 63 additions & 0 deletions .gitattributes
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
12 changes: 9 additions & 3 deletions MsgPack.cpp
Expand Up @@ -15,6 +15,12 @@

#include "include/MsgPack.h"

#ifdef WIN32
#define __builtin_bswap16 _byteswap_ushort
#define __builtin_bswap32 _byteswap_ulong
#define __builtin_bswap64 _byteswap_uint64
#endif

void storeUint8(uint8_t* target, uint8_t source) {
*reinterpret_cast<uint8_t*>(target) = source;
}
Expand Down Expand Up @@ -195,8 +201,8 @@ namespace MsgPack {
case Type::NIL:
stream << "null";
return;
case Type::ERROR:
stream << "error";
case Type::UNDEFINED:
stream << "undefined";
break;
case Type::BOOL_FALSE:
stream << "false";
Expand Down Expand Up @@ -957,7 +963,7 @@ namespace MsgPack {
else
switch(nextByte) {
case Type::NIL:
case Type::ERROR:
case Type::UNDEFINED:
case Type::BOOL_FALSE:
case Type::BOOL_TRUE:
element = new Primitive();
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -12,7 +12,7 @@ Features:
* Enable/Disable blocking mode
* Join/Leave UDP-Multicast groups
* UDP-IPv4-Broadcast
* Operating Systems: Mac OS, Linux
* Operating Systems: Mac OS, Linux, Windows
* Socket can be used as std::streambuf
* SocketManager calls events for connecting, disconnecting, receiving data and write buffer overflow
* MsgPack support: http://msgpack.org
Expand Down

0 comments on commit 48685b3

Please sign in to comment.