From 36df679819588192daf8c579028a1ad52be4c642 Mon Sep 17 00:00:00 2001 From: Brian Bosak Date: Mon, 12 Aug 2013 16:29:23 -0500 Subject: [PATCH] Fixed strange merge artifacts --- console.c | 3 --- lhnet.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/console.c b/console.c index 247bf738..6fd92ea0 100644 --- a/console.c +++ b/console.c @@ -2082,7 +2082,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); dpsnprintf(desc, sizeof(desc), "BSPHL"); -<<<<<<< HEAD } else if (!memcmp(buf, "BSP2", 4)) { @@ -2094,7 +2093,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer { lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); -======= } else if (!memcmp(buf, "BSP2", 4)) { @@ -2106,7 +2104,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer { lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); ->>>>>>> origin/divVerent/lhnet_tcp dpsnprintf(desc, sizeof(desc), "BSP2RMQe"); } else diff --git a/lhnet.h b/lhnet.h index 4dd25cce..069188eb 100644 --- a/lhnet.h +++ b/lhnet.h @@ -40,18 +40,15 @@ lhnetsocket_t; void LHNET_Init(void); // must be called before any other threads got spawned void LHNET_Shutdown(void); -<<<<<<< HEAD int LHNET_DefaultDSCP(int dscp); // < 0: query; >= 0: set (returns previous value) void LHNET_SleepUntilPacket_Microseconds(int microseconds); lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address); void LHNET_CloseSocket(lhnetsocket_t *lhnetsocket); -======= int LHNET_DefaultDSCP(int dscp); // < 0: query; >= 0: set (returns previous value); NOT thread-safe but usually does not matter (lhnet_default_dscp) void LHNET_SleepUntilPacket_Microseconds(int microseconds); // must only be used from the main thread lhnetsocket_t *LHNET_OpenSocket(lhnetaddress_t *address, lhnetaddress_t *peeraddress, int use_tcp, int use_blocking, int register_for_select); // thread-safe ONLY if register_for_select is false (socketlist) lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address); // NOT thread-safe! (socketlist) void LHNET_CloseSocket(lhnetsocket_t *lhnetsocket); // thread-safe ONLY when the socket was created with register_for_select being false (socketlist) ->>>>>>> origin/divVerent/lhnet_tcp lhnetaddress_t *LHNET_AddressFromSocket(lhnetsocket_t *sock); int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength, lhnetaddress_t *address); int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentlength, const lhnetaddress_t *address); -- 2.39.2