From 3eca8915fd14dcebe88647a198bfce5d789a6efb Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Thu, 9 Nov 2006 22:19:45 +0000
Subject: Fixed a conflict with Windows headers and updated project files

---
 src/net/network.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/net/network.h')

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:
-- 
cgit v1.2.3-70-g09d2