Mem_Free on a const pointer apparently irritates MSVC but not gcc... hush MSVC

[xonotic/darkplaces.git] / net.h

diff --git a/net.h b/net.h
index 105df0f534949571730751b6d1fcbf0a2e4618d2..c111bf0e8ed7f3cbe2e70ba2ad4ddd17e4f8f9a2 100644 (file)
--- a/net.h
+++ b/net.h
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net.h -- quake's interface to the networking layer
 
+#ifndef NET_H
+#define NET_H
+
 struct qsockaddr
 {
        short sa_family;
@@ -126,7 +129,7 @@ typedef struct qsocket_s
        qboolean                disconnected;
        qboolean                canSend;
        qboolean                sendNext;
-       
+
        int                             driver;
        int                             landriver;
        int                             socket;
@@ -136,21 +139,19 @@ typedef struct qsocket_s
        unsigned int    sendSequence;
        unsigned int    unreliableSendSequence;
        int                             sendMessageLength;
-       byte                    sendMessage [NET_MAXMESSAGE];
+       qbyte                   sendMessage [NET_MAXMESSAGE];
 
        unsigned int    receiveSequence;
        unsigned int    unreliableReceiveSequence;
        int                             receiveMessageLength;
-       byte                    receiveMessage [NET_MAXMESSAGE];
+       qbyte                   receiveMessage [NET_MAXMESSAGE];
 
        struct qsockaddr        addr;
        char                            address[NET_NAMELEN];
-
 } qsocket_t;
 
 extern qsocket_t       *net_activeSockets;
-extern qsocket_t       *net_freeSockets;
-extern int                     net_numsockets;
+extern mempool_t *net_mempool;
 
 typedef struct
 {
@@ -164,14 +165,14 @@ typedef struct
        int             (*CloseSocket) (int socket);
        int             (*Connect) (int socket, struct qsockaddr *addr);
        int             (*CheckNewConnections) (void);
-       int             (*Read) (int socket, byte *buf, int len, struct qsockaddr *addr);
-       int             (*Write) (int socket, byte *buf, int len, struct qsockaddr *addr);
-       int             (*Broadcast) (int socket, byte *buf, int len);
+       int             (*Read) (int socket, qbyte *buf, int len, struct qsockaddr *addr);
+       int             (*Write) (int socket, qbyte *buf, int len, struct qsockaddr *addr);
+       int             (*Broadcast) (int socket, qbyte *buf, int len);
        char *          (*AddrToString) (struct qsockaddr *addr);
-       int             (*StringToAddr) (char *string, struct qsockaddr *addr);
+       int             (*StringToAddr) (const char *string, struct qsockaddr *addr);
        int             (*GetSocketAddr) (int socket, struct qsockaddr *addr);
        int             (*GetNameFromAddr) (struct qsockaddr *addr, char *name);
-       int             (*GetAddrFromName) (char *name, struct qsockaddr *addr);
+       int             (*GetAddrFromName) (const char *name, struct qsockaddr *addr);
        int                     (*AddrCompare) (struct qsockaddr *addr1, struct qsockaddr *addr2);
        int                     (*GetSocketPort) (struct qsockaddr *addr);
        int                     (*SetSocketPort) (struct qsockaddr *addr, int port);
@@ -328,3 +329,6 @@ extern      qboolean        slistLocal;
 extern cvar_t hostname;
 
 void NET_Slist_f (void);
+
+#endif
+