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/win32/win_local.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/win32/win_local.h')
-rw-r--r-- | code/win32/win_local.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/code/win32/win_local.h b/code/win32/win_local.h index 14c0de5..e4414b4 100644 --- a/code/win32/win_local.h +++ b/code/win32/win_local.h @@ -35,8 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include <dinput.h> #include <dsound.h> -#include <winsock.h> -#include <wsipx.h> #include <shlobj.h> void IN_MouseEvent (int mstate); |