diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-07-29 12:50:49 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-07-29 12:51:27 +0400 |
| commit | f310c0f16b7d30c1f60eb4ae794748ef5d2ba77c (patch) | |
| tree | e97594e903e36bef14571df87aeb31a895357d4b /src/node_constants.cc | |
| parent | ef3c4ed3dd23522d871e5951766441a7a0512f47 (diff) | |
| parent | 38f6fcd822103f7e896532239c60c47b8fcc7d22 (diff) | |
| download | node-new-f310c0f16b7d30c1f60eb4ae794748ef5d2ba77c.tar.gz | |
Merge remote-tracking branch 'origin/v0.10' into master
Conflicts:
doc/api/buffer.markdown
lib/_stream_readable.js
lib/assert.js
lib/buffer.js
lib/child_process.js
lib/http.js
lib/string_decoder.js
lib/zlib.js
node.gyp
test/simple/test-buffer.js
test/simple/test-https-foafssl.js
test/simple/test-stream2-compatibility.js
test/simple/test-tls-server-verify.js
Diffstat (limited to 'src/node_constants.cc')
| -rw-r--r-- | src/node_constants.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/node_constants.cc b/src/node_constants.cc index d4f0c69c35..dc7dc80670 100644 --- a/src/node_constants.cc +++ b/src/node_constants.cc @@ -19,24 +19,15 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -// O_NONBLOCK is not exported unless _XOPEN_SOURCE >= 500. -#if defined(_XOPEN_SOURCE) && _XOPEN_SOURCE < 500 -#undef _XOPEN_SOURCE -#endif - -#if !defined(_XOPEN_SOURCE) -#define _XOPEN_SOURCE 500 -#endif - #include "node_constants.h" #include "uv.h" #include <errno.h> -#include <fcntl.h> #if !defined(_MSC_VER) #include <unistd.h> #endif +#include <fcntl.h> #include <signal.h> #include <sys/types.h> #include <sys/stat.h> |