From 8e5b91c79bab85d5a548dc3b19c3dce4f8ba29f9 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Mon, 10 May 2010 16:38:14 -0700 Subject: [PATCH] Revert "Check for strings.h" This reverts commit 032f651824869c429cc24fbd9f7a23e84ed34b1f. --- src/node.cc | 7 +------ src/node_buffer.cc | 8 +------- src/node_child_process.cc | 7 +------ src/node_crypto.cc | 6 +----- src/node_events.cc | 8 ++------ src/node_file.cc | 7 +------ src/node_net2.cc | 6 +----- src/node_stat_watcher.cc | 6 +----- src/node_stdio.cc | 6 +----- wscript | 2 -- 10 files changed, 10 insertions(+), 53 deletions(-) diff --git a/src/node.cc b/src/node.cc index bfb481e..0fb925d 100644 --- a/src/node.cc +++ b/src/node.cc @@ -5,6 +5,7 @@ #include #include +#include #include /* PATH_MAX */ #include #include @@ -13,12 +14,6 @@ #include #include /* setuid, getuid */ -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif - #include #include #include diff --git a/src/node_buffer.cc b/src/node_buffer.cc index bae738b..d757b96 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -4,13 +4,7 @@ #include // malloc, free #include -// memcpy -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif - +#include // memcpy #include // htons, htonl diff --git a/src/node_child_process.cc b/src/node_child_process.cc index d240d6f..6c84514 100644 --- a/src/node_child_process.cc +++ b/src/node_child_process.cc @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -12,12 +13,6 @@ #include #endif -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif - extern char **environ; namespace node { diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 50519b4..284ae49 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -4,11 +4,7 @@ #include #include -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif +#include #include #include diff --git a/src/node_events.cc b/src/node_events.cc index 4148ea0..c43225a 100644 --- a/src/node_events.cc +++ b/src/node_events.cc @@ -3,18 +3,14 @@ #include #include +#include +#include #include #include #include #include /* inet_ntop */ #include /* sockaddr_in, sockaddr_in6 */ -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif - #include #include #include diff --git a/src/node_file.cc b/src/node_file.cc index b1cbd9b..f9fd27c 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -10,15 +10,10 @@ #include #include #include +#include #include #include -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif - /* used for readlink, AIX doesn't provide it */ #ifndef PATH_MAX #define PATH_MAX 4096 diff --git a/src/node_net2.cc b/src/node_net2.cc index d9d485c..865bf7c 100644 --- a/src/node_net2.cc +++ b/src/node_net2.cc @@ -4,11 +4,7 @@ #include #include -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif +#include #include #include diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc index 816ec96..88ae9c6 100644 --- a/src/node_stat_watcher.cc +++ b/src/node_stat_watcher.cc @@ -2,12 +2,8 @@ #include #include +#include #include -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif namespace node { diff --git a/src/node_stdio.cc b/src/node_stdio.cc index fab00ae..c27e6f3 100644 --- a/src/node_stdio.cc +++ b/src/node_stdio.cc @@ -3,11 +3,7 @@ #include #include -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif +#include #include using namespace v8; diff --git a/wscript b/wscript index fab15b2..fb632a6 100644 --- a/wscript +++ b/wscript @@ -114,8 +114,6 @@ def configure(conf): conf.env["USE_DEBUG"] = Options.options.debug conf.env["USE_SYSTEM"] = Options.options.system - conf.check_cc(header_name="strings.h") - conf.check(lib='dl', uselib_store='DL') if not sys.platform.startswith("sunos"): conf.env.append_value("CCFLAGS", "-rdynamic") -- 2.7.4