diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-07-08 04:41:38 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-07-08 04:41:38 +0200 |
commit | 4dc35fb5b6b574552a432622274941a6e4c67476 (patch) | |
tree | bf6e586298b6392186519212e8c8ad382b52b3a7 | |
parent | 46465ecf72ee5c0910d036668eba499928f3379e (diff) | |
download | busybox-w32-4dc35fb5b6b574552a432622274941a6e4c67476.tar.gz busybox-w32-4dc35fb5b6b574552a432622274941a6e4c67476.tar.bz2 busybox-w32-4dc35fb5b6b574552a432622274941a6e4c67476.zip |
platform.h: tweaks for cygwin
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | include/platform.h | 15 | ||||
-rw-r--r-- | libbb/Kbuild.src | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/include/platform.h b/include/platform.h index 60864c929..07b1faa9f 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -116,7 +116,7 @@ | |||
116 | 116 | ||
117 | /* Make all declarations hidden (-fvisibility flag only affects definitions) */ | 117 | /* Make all declarations hidden (-fvisibility flag only affects definitions) */ |
118 | /* (don't include system headers after this until corresponding pop!) */ | 118 | /* (don't include system headers after this until corresponding pop!) */ |
119 | #if __GNUC_PREREQ(4,1) | 119 | #if __GNUC_PREREQ(4,1) && !defined(__CYGWIN__) |
120 | # define PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN _Pragma("GCC visibility push(hidden)") | 120 | # define PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN _Pragma("GCC visibility push(hidden)") |
121 | # define POP_SAVED_FUNCTION_VISIBILITY _Pragma("GCC visibility pop") | 121 | # define POP_SAVED_FUNCTION_VISIBILITY _Pragma("GCC visibility pop") |
122 | #else | 122 | #else |
@@ -329,6 +329,10 @@ typedef unsigned smalluint; | |||
329 | # endif | 329 | # endif |
330 | #endif | 330 | #endif |
331 | 331 | ||
332 | #if defined(__CYGWIN__) | ||
333 | # define MAXSYMLINKS SYMLOOP_MAX | ||
334 | #endif | ||
335 | |||
332 | 336 | ||
333 | /* ---- Who misses what? ------------------------------------ */ | 337 | /* ---- Who misses what? ------------------------------------ */ |
334 | 338 | ||
@@ -389,6 +393,15 @@ typedef unsigned smalluint; | |||
389 | # undef HAVE_NET_ETHERNET_H | 393 | # undef HAVE_NET_ETHERNET_H |
390 | #endif | 394 | #endif |
391 | 395 | ||
396 | #if defined(__CYGWIN__) | ||
397 | # undef HAVE_CLEARENV | ||
398 | # undef HAVE_FDPRINTF | ||
399 | # undef HAVE_MEMRCHR | ||
400 | # undef HAVE_PTSNAME_R | ||
401 | # undef HAVE_STRVERSCMP | ||
402 | # undef HAVE_UNLOCKED_LINE_OPS | ||
403 | #endif | ||
404 | |||
392 | /* These BSD-derived OSes share many similarities */ | 405 | /* These BSD-derived OSes share many similarities */ |
393 | #if (defined __digital__ && defined __unix__) \ | 406 | #if (defined __digital__ && defined __unix__) \ |
394 | || defined __APPLE__ \ | 407 | || defined __APPLE__ \ |
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index a6e80e692..875d02456 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -97,7 +97,6 @@ lib-y += strrstr.o | |||
97 | lib-y += time.o | 97 | lib-y += time.o |
98 | lib-y += trim.o | 98 | lib-y += trim.o |
99 | lib-y += u_signal_names.o | 99 | lib-y += u_signal_names.o |
100 | lib-y += udp_io.o | ||
101 | lib-y += uuencode.o | 100 | lib-y += uuencode.o |
102 | lib-y += vdprintf.o | 101 | lib-y += vdprintf.o |
103 | lib-y += verror_msg.o | 102 | lib-y += verror_msg.o |
@@ -127,6 +126,15 @@ lib-$(CONFIG_FEATURE_MTAB_SUPPORT) += mtab.o | |||
127 | lib-$(CONFIG_UNICODE_SUPPORT) += unicode.o | 126 | lib-$(CONFIG_UNICODE_SUPPORT) += unicode.o |
128 | lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o | 127 | lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o |
129 | 128 | ||
129 | lib-$(CONFIG_NC) += udp_io.o | ||
130 | lib-$(CONFIG_DNSD) += udp_io.o | ||
131 | lib-$(CONFIG_NTPD) += udp_io.o | ||
132 | lib-$(CONFIG_TFTP) += udp_io.o | ||
133 | lib-$(CONFIG_TFTPD) += udp_io.o | ||
134 | lib-$(CONFIG_TCPSVD) += udp_io.o | ||
135 | lib-$(CONFIG_UDPSVD) += udp_io.o | ||
136 | lib-$(CONFIG_TRACEROUTE) += udp_io.o | ||
137 | |||
130 | lib-$(CONFIG_LOSETUP) += loop.o | 138 | lib-$(CONFIG_LOSETUP) += loop.o |
131 | lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o | 139 | lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o |
132 | 140 | ||