summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Indutny <fedor@indutny.com>2014-06-30 12:43:28 +0400
committerTrevor Norris <trev.norris@gmail.com>2014-07-02 12:49:59 -0700
commit47ee9a48a842126af628d41450fd38a70e5408cc (patch)
tree589ccb1b99ea96338f264c982b3e736db09fbb34
parent4128d4d2ba8f346cab2b062f57ae4cb4831e7bb5 (diff)
downloadnode-new-47ee9a48a842126af628d41450fd38a70e5408cc.tar.gz
Revert "src: fix _XOPEN_SOURCE redefinition warning"
This reverts commit 885142a5edc2c803fa8b9d92b5d0771379237764. Signed-off-by: Trevor Norris <trev.norris@gmail.com>
-rw-r--r--src/node_constants.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/node_constants.cc b/src/node_constants.cc
index adb6f28181..d364fb2df4 100644
--- a/src/node_constants.cc
+++ b/src/node_constants.cc
@@ -19,21 +19,11 @@
// 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
@@ -41,6 +31,10 @@
#include <sys/types.h>
#include <sys/stat.h>
+// O_NONBLOCK is not exported, unless _XOPEN_SOURCE is set
+#define _XOPEN_SOURCE 500
+#include <fcntl.h>
+
#if HAVE_OPENSSL
# include <openssl/ssl.h>
#endif