summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Gilli <julien.gilli@joyent.com>2014-11-17 12:00:11 -0800
committercjihrig <cjihrig@gmail.com>2015-03-16 16:20:16 -0400
commit68d4bed2fd05f22472cebb24cb10a5679de47cbf (patch)
tree2b6f121b9ad2155514a2f1e4e9b21d3c8a975129
parent30666f22ca5041a991ab9e7311916ac218ed4c0f (diff)
downloadnode-new-68d4bed2fd05f22472cebb24cb10a5679de47cbf.tar.gz
make: remove node_dtrace from cpplint excludes
PR-URL: https://github.com/joyent/node/pull/8741 Reviewed-By: Fedor Indutny <fedor@indutny.com>
-rw-r--r--Makefile1
-rw-r--r--src/node_dtrace.cc10
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index a71d796fbe..aeba1939ed 100644
--- a/Makefile
+++ b/Makefile
@@ -385,7 +385,6 @@ jslint:
PYTHONPATH=tools/closure_linter/:tools/gflags/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
CPPLINT_EXCLUDE ?=
-CPPLINT_EXCLUDE += src/node_dtrace.cc
CPPLINT_EXCLUDE += src/node_lttng.cc
CPPLINT_EXCLUDE += src/node_root_certs.h
CPPLINT_EXCLUDE += src/node_lttng_tp.h
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc
index 1b25db44e2..d82e0f7dcb 100644
--- a/src/node_dtrace.cc
+++ b/src/node_dtrace.cc
@@ -1,12 +1,8 @@
-#include "util.h"
+#include "node_dtrace.h"
#ifdef HAVE_DTRACE
-#include "node_dtrace.h"
#include "node_provider.h"
-#include <string.h>
#elif HAVE_ETW
-#include "node_dtrace.h"
-#include <string.h>
#include "node_win32_etw_provider.h"
#include "node_win32_etw_provider-inl.h"
#else
@@ -29,6 +25,10 @@
#include "env.h"
#include "env-inl.h"
+#include "util.h"
+
+#include <string.h>
+
namespace node {
using v8::FunctionCallbackInfo;