luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.10'

Browse Source 
Conflicts:
	include/uv.h
	src/unix/error.c
This commit is contained in:
Fedor Indutny 2014-04-03 17:04:32 +04:00
commit 7d5ac7b9cc
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/uv-errno.h
View File

@ -400,4 +400,10 @@
# define UV__ENXIO (-4033) # define UV__ENXIO (-4033)
#endif #endif
#if defined(EMLINK) && !defined(_WIN32)
# define UV__EMLINK (-EMLINK)
#else
# define UV__EMLINK (-4032)
#endif
#endif /* UV_ERRNO_H_ */ #endif /* UV_ERRNO_H_ */

1
include/uv.h
View File

@ -138,6 +138,7 @@ extern "C" {
XX(UNKNOWN, "unknown error") \ XX(UNKNOWN, "unknown error") \
XX(EOF, "end of file") \ XX(EOF, "end of file") \
XX(ENXIO, "no such device or address") \ XX(ENXIO, "no such device or address") \
XX(EMLINK, "too many links") \
#define UV_HANDLE_TYPE_MAP(XX) \ #define UV_HANDLE_TYPE_MAP(XX) \
XX(ASYNC, async) \ XX(ASYNC, async) \