projects / platform / upstream / nodejs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e93ff4f) | patch
src: fix windows build error
authorBen Noordhuis <info@bnoordhuis.nl>
Tue, 11 Nov 2014 11:06:55 +0000 (12:06 +0100)
committerChris Dickinson <christopher.s.dickinson@gmail.com>
Wed, 17 Dec 2014 22:13:20 +0000 (14:13 -0800)
commit93533e98f76c2c9e577af3352b4eb709791f4d1e
treebb605c2d824eb5e630338148f97fcc29fe13c74dtree | snapshot
parente93ff4f0ce1b6e9077dfa64598006478276325b2commit | diff
src: fix windows build error

Fix a Windows-only build error that was introduced in
commit 1183ba4 ("zlib: support concatenated gzip files").

Rename the NO_ERROR and FAILED enumerations, they conflict
with macros of the same name in <winerror.h>.

PR-URL: https://github.com/joyent/node/pull/8893
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-by: Timothy J Fontaine <tjfontaine@gmail.com>
src/node_zlib.cc diff | blob | history
Domain: Web Framework / Common;