summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Gilli <julien.gilli@joyent.com>2014-11-17 12:00:11 -0800
committerJulien Gilli <julien.gilli@joyent.com>2015-03-13 10:46:53 -0700
commit588c009781d84a523fd84bb5feb66fa074849427 (patch)
tree53fc8f372570e56038b8b0e3f9f4993accb9abc0
parente8b21095670543ad6ee8e24e0a1b096b908e20b1 (diff)
downloadnode-588c009781d84a523fd84bb5feb66fa074849427.tar.gz
make: remove node_dtrace from cpplint excludes
Reviewed-By: Fedor Indutny <fedor@indutny.com> PR-URL: https://github.com/joyent/node/pull/8741
-rw-r--r--Makefile2
-rw-r--r--src/node_dtrace.cc11
2 files changed, 5 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 6c148eb2c..c241480df 100644
--- a/Makefile
+++ b/Makefile
@@ -425,8 +425,6 @@ jslint:
PYTHONPATH=tools/closure_linter/ $(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_dtrace.cc
CPPLINT_EXCLUDE += src/node_root_certs.h
CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc
CPPLINT_EXCLUDE += src/queue.h
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc
index 6e5e31083..8acff3947 100644
--- a/src/node_dtrace.cc
+++ b/src/node_dtrace.cc
@@ -19,16 +19,11 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#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
@@ -55,6 +50,10 @@
#include "env.h"
#include "env-inl.h"
+#include "util.h"
+
+#include <string.h>
+
namespace node {
using v8::FunctionCallbackInfo;