diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/common/socket.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6ecb567de..693dea8b6 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -2,6 +2,7 @@ Date Added 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] + * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] 2010/11/20 * Fixed @doom and @doommap spamming packets for the visual effect on invoker unnecessarily over whole map and server respectively. The effect is now displayed on each killed character (bugreport:871, since r311). [Ai4rei] * Fixed login-server account engine initialization not getting checked, whether it succeeds or not (bugreport:4361, since r12700, related r13000). [Ai4rei] diff --git a/src/common/socket.h b/src/common/socket.h index 73322a206..f7309f6d3 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -32,6 +32,8 @@ #define WFIFOW(fd,pos) (*(uint16*)WFIFOP(fd,pos)) #define RFIFOL(fd,pos) (*(uint32*)RFIFOP(fd,pos)) #define WFIFOL(fd,pos) (*(uint32*)WFIFOP(fd,pos)) +#define RFIFOQ(fd,pos) (*(uint64*)RFIFOP(fd,pos)) +#define WFIFOQ(fd,pos) (*(uint64*)WFIFOP(fd,pos)) #define RFIFOSPACE(fd) (session[fd]->max_rdata - session[fd]->rdata_size) #define WFIFOSPACE(fd) (session[fd]->max_wdata - session[fd]->wdata_size) @@ -52,11 +54,13 @@ #define RBUFB(p,pos) (*(uint8*)RBUFP((p),(pos))) #define RBUFW(p,pos) (*(uint16*)RBUFP((p),(pos))) #define RBUFL(p,pos) (*(uint32*)RBUFP((p),(pos))) +#define RBUFQ(p,pos) (*(uint64*)RBUFP((p),(pos))) #define WBUFP(p,pos) (((uint8*)(p)) + (pos)) #define WBUFB(p,pos) (*(uint8*)WBUFP((p),(pos))) #define WBUFW(p,pos) (*(uint16*)WBUFP((p),(pos))) #define WBUFL(p,pos) (*(uint32*)WBUFP((p),(pos))) +#define WBUFQ(p,pos) (*(uint64*)WBUFP((p),(pos))) #define TOB(n) ((uint8)((n)&UINT8_MAX)) #define TOW(n) ((uint16)((n)&UINT16_MAX)) |