From cebc0aa65f29d0eccd613112c1262e27cab69140 Mon Sep 17 00:00:00 2001
From: Jeroen Domburg <jeroen@spritesmods.com>
Date: Sun, 15 Mar 2015 16:49:09 +0100
Subject: [PATCH] Prefixed method consts to prevent clashes

---
 user/httpd.c | 4 ++--
 user/httpd.h | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/user/httpd.c b/user/httpd.c
index 1435bca..3ee871e 100644
--- a/user/httpd.c
+++ b/user/httpd.c
@@ -310,10 +310,10 @@ static void ICACHE_FLASH_ATTR httpdParseHeader(char *h, HttpdConnData *conn) {
   // os_printf("Got header %s\n", h);
 
 	if (os_strncmp(h, "GET ", 4)==0){
-		conn->requestType = GET;
+		conn->requestType = HTTPD_METHOD_GET;
 		first_line = true;
 	}else if(os_strncmp(h, "POST ", 5)==0) {
-		conn->requestType = POST;
+		conn->requestType = HTTPD_METHOD_POST;
 		first_line = true;
 	}
 
diff --git a/user/httpd.h b/user/httpd.h
index 38e75bb..ce6c070 100644
--- a/user/httpd.h
+++ b/user/httpd.h
@@ -4,15 +4,15 @@
 #include <ip_addr.h>
 #include <espconn.h>
 
-#define HTTPDVER "0.2"
+#define HTTPDVER "0.3"
 
 #define HTTPD_CGI_MORE 0
 #define HTTPD_CGI_DONE 1
 #define HTTPD_CGI_NOTFOUND 2
-#define HTTPD_CGI_AUTHENTICATED 3 //for now
+#define HTTPD_CGI_AUTHENTICATED 3
 
-#define GET 1
-#define POST 2
+#define HTTPD_METHOD_GET 1
+#define HTTPD_METHOD_POST 2
 
 typedef struct HttpdPriv HttpdPriv;
 typedef struct HttpdConnData HttpdConnData;