From ff4a9d381d2c77d1e074f9886c71003d5b7db25f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sat, 10 Mar 2012 00:11:11 +0100 Subject: core: use proper #include directives --- src/cares_wrap.cc | 6 +++--- src/fs_event_wrap.cc | 4 ++-- src/handle_wrap.cc | 4 ++-- src/node.cc | 34 +++++++++++++++++----------------- src/node.h | 6 +++--- src/node_buffer.cc | 6 +++--- src/node_buffer.h | 6 +++--- src/node_constants.cc | 4 ++-- src/node_constants.h | 4 ++-- src/node_crypto.cc | 12 ++++++------ src/node_crypto.h | 8 ++++---- src/node_dtrace.cc | 2 +- src/node_dtrace.h | 4 ++-- src/node_file.h | 4 ++-- src/node_http_parser.cc | 10 +++++----- src/node_http_parser.h | 2 +- src/node_io_watcher.cc | 6 +++--- src/node_io_watcher.h | 4 ++-- src/node_javascript.cc | 2 +- src/node_javascript.h | 2 +- src/node_main.cc | 2 +- src/node_object_wrap.h | 4 ++-- src/node_os.cc | 6 +++--- src/node_os.h | 4 ++-- src/node_script.cc | 4 ++-- src/node_script.h | 8 ++++---- src/node_signal_watcher.cc | 2 +- src/node_signal_watcher.h | 6 +++--- src/node_stat_watcher.cc | 2 +- src/node_stat_watcher.h | 4 ++-- src/node_string.h | 2 +- src/node_zlib.cc | 6 +++--- src/pipe_wrap.cc | 12 ++++++------ src/pipe_wrap.h | 2 +- src/process_wrap.cc | 6 +++--- src/stream_wrap.cc | 14 +++++++------- src/stream_wrap.h | 6 +++--- src/tcp_wrap.cc | 12 ++++++------ src/tcp_wrap.h | 2 +- src/timer_wrap.cc | 4 ++-- src/tty_wrap.cc | 10 +++++----- src/udp_wrap.cc | 8 ++++---- src/v8_typed_array.h | 2 +- 43 files changed, 129 insertions(+), 129 deletions(-) (limited to 'src') diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index a881c25b073..c356daf7245 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -20,9 +20,9 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include -#include -#include +#include "node.h" +#include "req_wrap.h" +#include "uv.h" #include diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc index 48cdabc00e2..f0b5e9c6034 100644 --- a/src/fs_event_wrap.cc +++ b/src/fs_event_wrap.cc @@ -19,8 +19,8 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "node.h" +#include "handle_wrap.h" #include diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc index eb6713edad9..d9621b4c4bf 100644 --- a/src/handle_wrap.cc +++ b/src/handle_wrap.cc @@ -19,8 +19,8 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "node.h" +#include "handle_wrap.h" namespace node { diff --git a/src/node.cc b/src/node.cc index 525a9c0348b..4281028197f 100644 --- a/src/node.cc +++ b/src/node.cc @@ -19,13 +19,13 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node.h" -#include +#include "uv.h" -#include +#include "v8-debug.h" #ifdef HAVE_DTRACE -# include +# include "node_dtrace.h" #endif #include @@ -61,25 +61,25 @@ typedef int mode_t; # include /* getgrnam() */ #endif -#include +#include "node_buffer.h" #ifdef __POSIX__ -# include +# include "node_io_watcher.h" #endif -#include -#include +#include "node_file.h" +#include "node_http_parser.h" #ifdef __POSIX__ -# include -# include +# include "node_signal_watcher.h" +# include "node_stat_watcher.h" #endif -#include -#include -#include -#include +#include "node_constants.h" +#include "node_javascript.h" +#include "node_version.h" +#include "node_string.h" #if HAVE_OPENSSL -# include +# include "node_crypto.h" #endif -#include -#include +#include "node_script.h" +#include "v8_typed_array.h" using namespace v8; diff --git a/src/node.h b/src/node.h index 703c74478ef..788b65a964f 100644 --- a/src/node.h +++ b/src/node.h @@ -58,13 +58,13 @@ # define SIGKILL 9 #endif -#include -#include +#include "uv.h" +#include "v8.h" #include /* struct stat */ #include #include -#include +#include "node_object_wrap.h" #if NODE_WANT_INTERNALS # include "node_internals.h" diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 12fe1e0962c..882fa384a52 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "node.h" +#include "node_buffer.h" -#include +#include "v8.h" #include #include // malloc, free diff --git a/src/node_buffer.h b/src/node_buffer.h index abfafa3264f..c36f20b2f04 100644 --- a/src/node_buffer.h +++ b/src/node_buffer.h @@ -22,9 +22,9 @@ #ifndef NODE_BUFFER_H_ #define NODE_BUFFER_H_ -#include -#include -#include +#include "node.h" +#include "node_object_wrap.h" +#include "v8.h" #include namespace node { diff --git a/src/node_constants.cc b/src/node_constants.cc index 25ad02f8f99..7999f51ea42 100644 --- a/src/node_constants.cc +++ b/src/node_constants.cc @@ -19,9 +19,9 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node_constants.h" -#include +#include "uv.h" #include #if !defined(_MSC_VER) diff --git a/src/node_constants.h b/src/node_constants.h index ac7dce00f67..c75f40abf73 100644 --- a/src/node_constants.h +++ b/src/node_constants.h @@ -22,8 +22,8 @@ #ifndef SRC_CONSTANTS_H_ #define SRC_CONSTANTS_H_ -#include -#include +#include "node.h" +#include "v8.h" namespace node { void DefineConstants(v8::Handle target); diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 0403a036143..44bff41a79b 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -19,13 +19,13 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include -#include +#include "node_crypto.h" +#include "node_crypto_groups.h" +#include "v8.h" -#include -#include -#include +#include "node.h" +#include "node_buffer.h" +#include "node_root_certs.h" #include #ifdef _MSC_VER diff --git a/src/node_crypto.h b/src/node_crypto.h index 87a5340147c..9fcddf01338 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -22,10 +22,10 @@ #ifndef SRC_NODE_CRYPTO_H_ #define SRC_NODE_CRYPTO_H_ -#include +#include "node.h" -#include -#include +#include "node_object_wrap.h" +#include "v8.h" #include #include @@ -37,7 +37,7 @@ #include #ifdef OPENSSL_NPN_NEGOTIATED -#include +#include "node_buffer.h" #endif #define EVP_F_EVP_DECRYPTFINAL 101 diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index fc820159225..431a4ab319a 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node_dtrace.h" #include #ifdef HAVE_DTRACE diff --git a/src/node_dtrace.h b/src/node_dtrace.h index f10b26783fe..5374ab60c0c 100644 --- a/src/node_dtrace.h +++ b/src/node_dtrace.h @@ -22,8 +22,8 @@ #ifndef NODE_DTRACE_H_ #define NODE_DTRACE_H_ -#include -#include +#include "node.h" +#include "v8.h" extern "C" { diff --git a/src/node_file.h b/src/node_file.h index e98b115d401..5757e732b58 100644 --- a/src/node_file.h +++ b/src/node_file.h @@ -22,8 +22,8 @@ #ifndef SRC_FILE_H_ #define SRC_FILE_H_ -#include -#include +#include "node.h" +#include "v8.h" namespace node { diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc index 1f59c0b070d..fdcb0f08a23 100644 --- a/src/node_http_parser.cc +++ b/src/node_http_parser.cc @@ -19,13 +19,13 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node_http_parser.h" -#include -#include -#include +#include "v8.h" +#include "node.h" +#include "node_buffer.h" -#include +#include "http_parser.h" #include /* strdup() */ #if !defined(_MSC_VER) diff --git a/src/node_http_parser.h b/src/node_http_parser.h index 456a0008312..e4f30130f65 100644 --- a/src/node_http_parser.h +++ b/src/node_http_parser.h @@ -22,7 +22,7 @@ #ifndef NODE_HTTP_PARSER #define NODE_HTTP_PARSER -#include +#include "v8.h" namespace node { diff --git a/src/node_io_watcher.cc b/src/node_io_watcher.cc index 4854a8fa9a7..3d1ab51fa22 100644 --- a/src/node_io_watcher.cc +++ b/src/node_io_watcher.cc @@ -19,10 +19,10 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node_io_watcher.h" -#include -#include +#include "node.h" +#include "v8.h" #include diff --git a/src/node_io_watcher.h b/src/node_io_watcher.h index 81014feb393..d14289c8674 100644 --- a/src/node_io_watcher.h +++ b/src/node_io_watcher.h @@ -22,8 +22,8 @@ #ifndef NODE_IO_H_ #define NODE_IO_H_ -#include -#include +#include "node_object_wrap.h" +#include "uv-private/ev.h" namespace node { diff --git a/src/node_javascript.cc b/src/node_javascript.cc index 2aef03501b0..49695c0824e 100644 --- a/src/node_javascript.cc +++ b/src/node_javascript.cc @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "v8.h" #include "node.h" #include "node_natives.h" #include "node_string.h" diff --git a/src/node_javascript.h b/src/node_javascript.h index 58e5010d65c..2cfa9795475 100644 --- a/src/node_javascript.h +++ b/src/node_javascript.h @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "v8.h" namespace node { diff --git a/src/node_main.cc b/src/node_main.cc index dba8b69203b..6471551d2c2 100644 --- a/src/node_main.cc +++ b/src/node_main.cc @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node.h" #ifdef _WIN32 int wmain(int argc, wchar_t *wargv[]) { diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h index 0ead639b645..311f3f0f429 100644 --- a/src/node_object_wrap.h +++ b/src/node_object_wrap.h @@ -22,8 +22,8 @@ #ifndef object_wrap_h #define object_wrap_h -#include -#include +#include "node.h" +#include "v8.h" #include namespace node { diff --git a/src/node_os.cc b/src/node_os.cc index b854961132f..c09458e60d4 100644 --- a/src/node_os.cc +++ b/src/node_os.cc @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "node.h" +#include "node_os.h" -#include +#include "v8.h" #include #include diff --git a/src/node_os.h b/src/node_os.h index 596d268e70a..25ff71eee34 100644 --- a/src/node_os.h +++ b/src/node_os.h @@ -22,8 +22,8 @@ #ifndef node_os_h #define node_os_h -#include -#include +#include "node.h" +#include "v8.h" namespace node { diff --git a/src/node_script.cc b/src/node_script.cc index c6db76ea5ea..8f35b5a13f1 100644 --- a/src/node_script.cc +++ b/src/node_script.cc @@ -19,8 +19,8 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "node.h" +#include "node_script.h" #include namespace node { diff --git a/src/node_script.h b/src/node_script.h index 5074abf2d3b..047829f539d 100644 --- a/src/node_script.h +++ b/src/node_script.h @@ -22,10 +22,10 @@ #ifndef node_script_h #define node_script_h -#include -#include -#include -#include +#include "node.h" +#include "node_object_wrap.h" +#include "v8.h" +#include "uv.h" namespace node { diff --git a/src/node_signal_watcher.cc b/src/node_signal_watcher.cc index 1027b3efd18..a0b57e0d20c 100644 --- a/src/node_signal_watcher.cc +++ b/src/node_signal_watcher.cc @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node_signal_watcher.h" #include namespace node { diff --git a/src/node_signal_watcher.h b/src/node_signal_watcher.h index 63fe1c7966b..f46022bd333 100644 --- a/src/node_signal_watcher.h +++ b/src/node_signal_watcher.h @@ -22,9 +22,9 @@ #ifndef NODE_SIGNAL_WATCHER_H_ #define NODE_SIGNAL_WATCHER_H_ -#include -#include -#include +#include "node.h" +#include "v8.h" +#include "uv-private/ev.h" namespace node { diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc index fd4d68a5cc6..5b06966b966 100644 --- a/src/node_stat_watcher.cc +++ b/src/node_stat_watcher.cc @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "node_stat_watcher.h" #include #include diff --git a/src/node_stat_watcher.h b/src/node_stat_watcher.h index b220f20b2c1..2b2d1331de2 100644 --- a/src/node_stat_watcher.h +++ b/src/node_stat_watcher.h @@ -22,8 +22,8 @@ #ifndef NODE_STAT_WATCHER_H_ #define NODE_STAT_WATCHER_H_ -#include -#include +#include "node.h" +#include "uv-private/ev.h" namespace node { diff --git a/src/node_string.h b/src/node_string.h index 5625f22dbe9..b4a0a9b86a9 100644 --- a/src/node_string.h +++ b/src/node_string.h @@ -22,7 +22,7 @@ #ifndef SRC_NODE_STRING_H_ #define SRC_NODE_STRING_H_ -#include +#include "v8.h" namespace node { diff --git a/src/node_zlib.cc b/src/node_zlib.cc index a27fcef3757..5d631167831 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -20,15 +20,15 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include +#include "v8.h" #include #include #include #include #include -#include -#include +#include "node.h" +#include "node_buffer.h" namespace node { diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index 68052942024..d2379a59a79 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -19,12 +19,12 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include -#include -#include -#include -#include +#include "node.h" +#include "node_buffer.h" +#include "req_wrap.h" +#include "handle_wrap.h" +#include "stream_wrap.h" +#include "pipe_wrap.h" #define UNWRAP \ assert(!args.Holder().IsEmpty()); \ diff --git a/src/pipe_wrap.h b/src/pipe_wrap.h index 5551dd7a8dd..d5241e08f32 100644 --- a/src/pipe_wrap.h +++ b/src/pipe_wrap.h @@ -21,7 +21,7 @@ #ifndef PIPE_WRAP_H_ #define PIPE_WRAP_H_ -#include +#include "stream_wrap.h" namespace node { diff --git a/src/process_wrap.cc b/src/process_wrap.cc index 6600a044c86..69ac7fb0355 100644 --- a/src/process_wrap.cc +++ b/src/process_wrap.cc @@ -19,9 +19,9 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include -#include +#include "node.h" +#include "handle_wrap.h" +#include "pipe_wrap.h" #include #include diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index cb4d4d6e40a..9940829585d 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -19,13 +19,13 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include -#include -#include -#include -#include -#include +#include "node.h" +#include "node_buffer.h" +#include "handle_wrap.h" +#include "stream_wrap.h" +#include "pipe_wrap.h" +#include "tcp_wrap.h" +#include "req_wrap.h" #include // abort() diff --git a/src/stream_wrap.h b/src/stream_wrap.h index 045420991ca..278fda78270 100644 --- a/src/stream_wrap.h +++ b/src/stream_wrap.h @@ -22,9 +22,9 @@ #ifndef STREAM_WRAP_H_ #define STREAM_WRAP_H_ -#include -#include -#include +#include "v8.h" +#include "node.h" +#include "handle_wrap.h" namespace node { diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index 14e6d3ed66b..3e5e4914636 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -19,12 +19,12 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include -#include -#include -#include -#include +#include "node.h" +#include "node_buffer.h" +#include "req_wrap.h" +#include "handle_wrap.h" +#include "stream_wrap.h" +#include "tcp_wrap.h" #include diff --git a/src/tcp_wrap.h b/src/tcp_wrap.h index 98ebb50458d..26e061f4830 100644 --- a/src/tcp_wrap.h +++ b/src/tcp_wrap.h @@ -21,7 +21,7 @@ #ifndef TCP_WRAP_H_ #define TCP_WRAP_H_ -#include +#include "stream_wrap.h" namespace node { diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc index 470c2d6b98d..273f8265f4c 100644 --- a/src/timer_wrap.cc +++ b/src/timer_wrap.cc @@ -19,8 +19,8 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "node.h" +#include "handle_wrap.h" #define UNWRAP \ assert(!args.Holder().IsEmpty()); \ diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index 486c2a70b4b..8647ea0b9cb 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -19,11 +19,11 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include -#include -#include -#include +#include "node.h" +#include "node_buffer.h" +#include "req_wrap.h" +#include "handle_wrap.h" +#include "stream_wrap.h" namespace node { diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc index 789366cbefe..16857ce0ec0 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -19,11 +19,11 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "node.h" +#include "node_buffer.h" -#include -#include +#include "req_wrap.h" +#include "handle_wrap.h" #include diff --git a/src/v8_typed_array.h b/src/v8_typed_array.h index a95b29a50b5..dc518ccdd7a 100644 --- a/src/v8_typed_array.h +++ b/src/v8_typed_array.h @@ -22,7 +22,7 @@ #ifndef V8_TYPED_ARRAY_H_ #define V8_TYPED_ARRAY_H_ -#include +#include "v8.h" namespace v8_typed_array { -- cgit v1.2.3