[Kernel] Fix macro collisions with macOS system headers
Rename IPPROTO_TCP/UDP/VDP enum values to XE_IPPROTO_* to avoid collision with macOS <netinet/in.h> macros. Add #undef WAIT_ANY guard for macOS <sys/wait.h> macro.
This commit is contained in:
@@ -90,13 +90,13 @@ class XSocket : public XObject {
|
||||
};
|
||||
|
||||
enum Protocol {
|
||||
IPPROTO_TCP = 6,
|
||||
IPPROTO_UDP = 17,
|
||||
XE_IPPROTO_TCP = 6,
|
||||
XE_IPPROTO_UDP = 17,
|
||||
|
||||
// LIVE Voice and Data Protocol
|
||||
// https://blog.csdn.net/baozi3026/article/details/4277227
|
||||
// Format: [cbGameData][GameData(encrypted)][VoiceData(unencrypted)]
|
||||
IPPROTO_VDP = 254,
|
||||
XE_IPPROTO_VDP = 254,
|
||||
};
|
||||
|
||||
XSocket(KernelState* kernel_state);
|
||||
|
||||
Reference in New Issue
Block a user