diff options
author | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
commit | 35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch) | |
tree | 6e0ff0341c69839e268459a199682628bae734ed /networking/tcpudp.c | |
parent | 248a2600a2f4b442101ad568d1994b908bb28d4b (diff) | |
parent | f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff) | |
download | busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2 busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking/tcpudp.c')
-rw-r--r-- | networking/tcpudp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/networking/tcpudp.c b/networking/tcpudp.c index 3df6a98d8..31bc70459 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c | |||
@@ -67,6 +67,7 @@ | |||
67 | //usage: "\n -v Verbose" | 67 | //usage: "\n -v Verbose" |
68 | 68 | ||
69 | #include "libbb.h" | 69 | #include "libbb.h" |
70 | #include "common_bufsiz.h" | ||
70 | 71 | ||
71 | /* Wants <limits.h> etc, thus included after libbb.h: */ | 72 | /* Wants <limits.h> etc, thus included after libbb.h: */ |
72 | #ifdef __linux__ | 73 | #ifdef __linux__ |
@@ -91,7 +92,7 @@ struct globals { | |||
91 | char **env_cur; | 92 | char **env_cur; |
92 | char *env_var[1]; /* actually bigger */ | 93 | char *env_var[1]; /* actually bigger */ |
93 | } FIX_ALIASING; | 94 | } FIX_ALIASING; |
94 | #define G (*(struct globals*)&bb_common_bufsiz1) | 95 | #define G (*(struct globals*)bb_common_bufsiz1) |
95 | #define verbose (G.verbose ) | 96 | #define verbose (G.verbose ) |
96 | #define max_per_host (G.max_per_host) | 97 | #define max_per_host (G.max_per_host) |
97 | #define cur_per_host (G.cur_per_host) | 98 | #define cur_per_host (G.cur_per_host) |
@@ -100,6 +101,7 @@ struct globals { | |||
100 | #define env_cur (G.env_cur ) | 101 | #define env_cur (G.env_cur ) |
101 | #define env_var (G.env_var ) | 102 | #define env_var (G.env_var ) |
102 | #define INIT_G() do { \ | 103 | #define INIT_G() do { \ |
104 | setup_common_bufsiz(); \ | ||
103 | cmax = 30; \ | 105 | cmax = 30; \ |
104 | env_cur = &env_var[0]; \ | 106 | env_cur = &env_var[0]; \ |
105 | } while (0) | 107 | } while (0) |