Skip to content

Commit 8e5b91c

Browse files
committed
Revert "Check for strings.h"
This reverts commit 032f651.
1 parent 032f651 commit 8e5b91c

10 files changed

+10
-53
lines changed

src/node.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <stdio.h>
77
#include <stdlib.h>
8+
#include <strings.h>
89
#include <limits.h> /* PATH_MAX */
910
#include <assert.h>
1011
#include <unistd.h>
@@ -13,12 +14,6 @@
1314
#include <sys/types.h>
1415
#include <unistd.h> /* setuid, getuid */
1516

16-
#ifdef HAVE_STRINGS_H
17-
# include <strings.h>
18-
#else
19-
# include <string.h>
20-
#endif
21-
2217
#include <node_buffer.h>
2318
#include <node_io_watcher.h>
2419
#include <node_net2.h>

src/node_buffer.cc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
#include <stdlib.h> // malloc, free
55
#include <v8.h>
66

7-
// memcpy
8-
#ifdef HAVE_STRINGS_H
9-
# include <strings.h>
10-
#else
11-
# include <string.h>
12-
#endif
13-
7+
#include <string.h> // memcpy
148

159
#include <arpa/inet.h> // htons, htonl
1610

src/node_child_process.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <node.h>
44

55
#include <assert.h>
6+
#include <string.h>
67
#include <stdlib.h>
78
#include <errno.h>
89
#include <unistd.h>
@@ -12,12 +13,6 @@
1213
#include <sys/wait.h>
1314
#endif
1415

15-
#ifdef HAVE_STRINGS_H
16-
# include <strings.h>
17-
#else
18-
# include <string.h>
19-
#endif
20-
2116
extern char **environ;
2217

2318
namespace node {

src/node_crypto.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
#include <node.h>
55
#include <node_buffer.h>
66

7-
#ifdef HAVE_STRINGS_H
8-
# include <strings.h>
9-
#else
10-
# include <string.h>
11-
#endif
7+
#include <string.h>
128
#include <stdlib.h>
139

1410
#include <errno.h>

src/node_events.cc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@
33

44
#include <assert.h>
55
#include <stdlib.h>
6+
#include <string.h>
7+
#include <strings.h>
68
#include <sys/types.h>
79
#include <sys/socket.h>
810
#include <netdb.h>
911
#include <arpa/inet.h> /* inet_ntop */
1012
#include <netinet/in.h> /* sockaddr_in, sockaddr_in6 */
1113

12-
#ifdef HAVE_STRINGS_H
13-
# include <strings.h>
14-
#else
15-
# include <string.h>
16-
#endif
17-
1814
#include <node.h>
1915
#include <ev.h>
2016
#include <v8.h>

src/node_file.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,10 @@
1010
#include <stdlib.h>
1111
#include <unistd.h>
1212
#include <assert.h>
13+
#include <string.h>
1314
#include <errno.h>
1415
#include <limits.h>
1516

16-
#ifdef HAVE_STRINGS_H
17-
# include <strings.h>
18-
#else
19-
# include <string.h>
20-
#endif
21-
2217
/* used for readlink, AIX doesn't provide it */
2318
#ifndef PATH_MAX
2419
#define PATH_MAX 4096

src/node_net2.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
#include <node.h>
55
#include <node_buffer.h>
66

7-
#ifdef HAVE_STRINGS_H
8-
# include <strings.h>
9-
#else
10-
# include <string.h>
11-
#endif
7+
#include <string.h>
128
#include <stdlib.h>
139

1410
#include <sys/types.h>

src/node_stat_watcher.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
#include <node_stat_watcher.h>
33

44
#include <assert.h>
5+
#include <string.h>
56
#include <stdlib.h>
6-
#ifdef HAVE_STRINGS_H
7-
# include <strings.h>
8-
#else
9-
# include <string.h>
10-
#endif
117

128
namespace node {
139

src/node_stdio.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33

44
#include <unistd.h>
55
#include <fcntl.h>
6-
#ifdef HAVE_STRINGS_H
7-
# include <strings.h>
8-
#else
9-
# include <string.h>
10-
#endif
6+
#include <string.h>
117
#include <errno.h>
128

139
using namespace v8;

wscript

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ def configure(conf):
114114
conf.env["USE_DEBUG"] = Options.options.debug
115115
conf.env["USE_SYSTEM"] = Options.options.system
116116

117-
conf.check_cc(header_name="strings.h")
118-
119117
conf.check(lib='dl', uselib_store='DL')
120118
if not sys.platform.startswith("sunos"):
121119
conf.env.append_value("CCFLAGS", "-rdynamic")

0 commit comments

Comments
 (0)