Merge branch 'v0.10'
Conflicts: include/uv.h src/unix/error.c
This commit is contained in:
commit
7d5ac7b9cc
@ -400,4 +400,10 @@
|
||||
# define UV__ENXIO (-4033)
|
||||
#endif
|
||||
|
||||
#if defined(EMLINK) && !defined(_WIN32)
|
||||
# define UV__EMLINK (-EMLINK)
|
||||
#else
|
||||
# define UV__EMLINK (-4032)
|
||||
#endif
|
||||
|
||||
#endif /* UV_ERRNO_H_ */
|
||||
|
||||
@ -138,6 +138,7 @@ extern "C" {
|
||||
XX(UNKNOWN, "unknown error") \
|
||||
XX(EOF, "end of file") \
|
||||
XX(ENXIO, "no such device or address") \
|
||||
XX(EMLINK, "too many links") \
|
||||
|
||||
#define UV_HANDLE_TYPE_MAP(XX) \
|
||||
XX(ASYNC, async) \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user