Skip to content

Commit c8c26f1

Browse files
committed
src: move header inclusion out of namespace
The placement of a previous fix to include proper size_t types in addons was erroneously placed inside a namespace, move to just before. Fix nodejs#6992
1 parent e63268e commit c8c26f1

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

src/node.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,17 @@ NODE_EXTERN v8::Handle<v8::Value> MakeCallback(
122122
# endif
123123
#endif
124124

125+
#ifdef _WIN32
126+
// TODO(tjfontaine) consider changing the usage of ssize_t to ptrdiff_t
127+
#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
128+
typedef intptr_t ssize_t;
129+
# define _SSIZE_T_
130+
# define _SSIZE_T_DEFINED
131+
#endif
132+
#else // !_WIN32
133+
# include <sys/types.h> // size_t, ssize_t
134+
#endif // _WIN32
135+
125136

126137
namespace node {
127138

@@ -184,17 +195,6 @@ void DisplayExceptionLine(v8::Handle<v8::Message> message);
184195
NODE_EXTERN v8::Local<v8::Value> Encode(const void *buf, size_t len,
185196
enum encoding encoding = BINARY);
186197

187-
#ifdef _WIN32
188-
// TODO(tjfontaine) consider changing the usage of ssize_t to ptrdiff_t
189-
#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
190-
typedef intptr_t ssize_t;
191-
# define _SSIZE_T_
192-
# define _SSIZE_T_DEFINED
193-
#endif
194-
#else // !_WIN32
195-
# include <sys/types.h> // size_t, ssize_t
196-
#endif // _WIN32
197-
198198
// Returns -1 if the handle was not valid for decoding
199199
NODE_EXTERN ssize_t DecodeBytes(v8::Handle<v8::Value>,
200200
enum encoding encoding = BINARY);

0 commit comments

Comments
 (0)