FEX-Emu/xbyak
1
0
Fork 0
mirror of https://github.com/FEX-Emu/xbyak.git synced 2024-11-27 00:20:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

define WIN32_LEAN_AND_MEAN for including winsock2.h after xbyak.h

Browse Source
This commit is contained in:
MITSUNARI Shigeo 2020-07-28 20:29:12 +09:00
parent 42dddb740c
commit 9a1749e655
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xbyak/xbyak.h
View File

@ -72,6 +72,9 @@
#define XBYAK_STD_UNORDERED_MULTIMAP std::multimap
#endif
#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <malloc.h>
#define XBYAK_TLS __declspec(thread)
@ -121,7 +124,7 @@ namespace Xbyak {
enum {
DEFAULT_MAX_CODE_SIZE = 4096,
VERSION = 0x5930 /* 0xABCD = A.BC(D) */
VERSION = 0x5940 /* 0xABCD = A.BC(D) */
};
#ifndef MIE_INTEGER_TYPE_DEFINED

2
xbyak/xbyak_mnemonic.h
View File

@ -1,4 +1,4 @@
const char *getVersionString() const { return "5.93"; }
const char *getVersionString() const { return "5.94"; }
void adc(const Operand& op, uint32 imm) { opRM_I(op, imm, 0x10, 2); }
void adc(const Operand& op1, const Operand& op2) { opRM_RM(op1, op2, 0x10); }
void adcx(const Reg32e& reg, const Operand& op) { opGen(reg, op, 0xF6, 0x66, isREG32_REG32orMEM, NONE, 0x38); }