Merge branch 'v0.6'

2012-04-02 23:50:27 +02:00 · 2012-04-02 23:50:27 +02:00 · 396d1383fe
commit 396d1383fe
parent 9d3c00046f 9c8f6dd4f9
2 changed files with 2 additions and 1 deletions
--- a/config-unix.mk
+++ b/config-unix.mk
@ -51,7 +51,7 @@ endif
 ifeq (Darwin,$(uname_S))
 EV_CONFIG=config_darwin.h
 EIO_CONFIG=config_darwin.h
-CPPFLAGS += -Isrc/ares/config_darwin
+CPPFLAGS += -D_DARWIN_USE_64_BIT_INODE=1 -Isrc/ares/config_darwin
 LINKFLAGS+=-framework CoreServices
 OBJS += src/unix/darwin.o
 OBJS += src/unix/kqueue.o
--- a/uv.gyp
+++ b/uv.gyp
@ -215,6 +215,7 @@
            ],
          },
          'defines': [
+            '_DARWIN_USE_64_BIT_INODE=1',
            'EV_CONFIG_H="config_darwin.h"',
            'EIO_CONFIG_H="config_darwin.h"',
          ]