From: Yann Collet <yann.collet.73@gmail.com>
Date: Thu, 21 Jan 2016 13:32:41 +0000 (+0100)
Subject: fixed VS 2015 'ERROR already defined', reported by Rich Geldreich
X-Git-Tag: v0.4.7^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74ce8e812c92d468e0a03abeb133fbf26eaaa869;p=thirdparty%2Fzstd.git

fixed VS 2015 'ERROR already defined', reported by Rich Geldreich
---

diff --git a/lib/error.h b/lib/error.h
index af3c1b569..2ec64d0c4 100644
--- a/lib/error.h
+++ b/lib/error.h
@@ -64,6 +64,9 @@ extern "C" {
 ******************************************/
 #define PREFIX(name) ZSTD_error_##name
 
+#ifdef ERROR
+#  undef ERROR   /* reported already defined on VS 2015 by Rich Geldreich */
+#endif
 #define ERROR(name) (size_t)-PREFIX(name)
 
 #define ERROR_LIST(ITEM) \