diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-28 16:42:13 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-28 16:42:13 +0000 |
| commit | 04fc4656c928d58cdbbc60c605c5036564919ff4 (patch) | |
| tree | a69fe4300fe993a4983dc57c9aeecd68c23faaf3 /code/qcommon/qcommon.h | |
| parent | f1ea2218d313ec44da8718529a8603616ae68619 (diff) | |
| download | ioquake3-aero-04fc4656c928d58cdbbc60c605c5036564919ff4.tar.gz ioquake3-aero-04fc4656c928d58cdbbc60c605c5036564919ff4.zip | |
* Merge win_net.c and unix_net.c
+ Move win32/win_net.c to qcommon/net_ip.c and make it portable
+ Remove unix_net.c, but incorporate its revision history into win_net.c
+ Remove all IPX support -- this remains compatible with existing mods
+ This change also inadvertently gets us SOCKS support on non-Windows
platforms
git-svn-id: svn://svn.icculus.org/quake3/trunk@1139 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/qcommon.h')
| -rw-r--r-- | code/qcommon/qcommon.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h index f0d6722..6382843 100644 --- a/code/qcommon/qcommon.h +++ b/code/qcommon/qcommon.h @@ -136,9 +136,7 @@ typedef enum { NA_BAD, // an address lookup failed NA_LOOPBACK, NA_BROADCAST, - NA_IP, - NA_IPX, - NA_BROADCAST_IPX + NA_IP } netadrtype_t; typedef enum { @@ -150,7 +148,6 @@ typedef struct { netadrtype_t type; byte ip[4]; - byte ipx[10]; unsigned short port; } netadr_t; |