diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-11-09 22:19:45 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-11-09 22:19:45 +0000 |
| commit | 3eca8915fd14dcebe88647a198bfce5d789a6efb (patch) | |
| tree | b0ae43817d759c1868eeb638907f4c0ee209effd /src/net/network.h | |
| parent | aa1989471451e15321357f4422afb79c9a9bae20 (diff) | |
| download | mana-3eca8915fd14dcebe88647a198bfce5d789a6efb.tar.gz mana-3eca8915fd14dcebe88647a198bfce5d789a6efb.tar.bz2 mana-3eca8915fd14dcebe88647a198bfce5d789a6efb.tar.xz mana-3eca8915fd14dcebe88647a198bfce5d789a6efb.zip | |
Fixed a conflict with Windows headers and updated project files
Diffstat (limited to 'src/net/network.h')
| -rw-r--r-- | src/net/network.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/network.h b/src/net/network.h index f4637f73..13929ec1 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -63,12 +63,13 @@ class Network void dispatchMessages(); void flush(); + // ERROR replaced by NET_ERROR because already defined in Windows enum { IDLE, CONNECTED, CONNECTING, DATA, - ERROR + NET_ERROR }; protected: |