aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-02-07 18:46:03 +0000
committerUlrich Drepper <drepper@redhat.com>2001-02-07 18:46:03 +0000
commit054d2bf7cc2fdc42ae29fae933fe30e0f121c308 (patch)
tree20d68dabe4640f57006fe98accde6c0e88c6e90c /sysdeps
parent0d3fee40893b9a1f52a3c1e4ec3b27f5f5053750 (diff)
downloadglibc-054d2bf7cc2fdc42ae29fae933fe30e0f121c308.zip
glibc-054d2bf7cc2fdc42ae29fae933fe30e0f121c308.tar.gz
glibc-054d2bf7cc2fdc42ae29fae933fe30e0f121c308.tar.bz2
Update.
2001-02-07 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Correct values of TCP_ macros. Patch by Pekka.Pietikainen@cern.ch. * posix/regex.c: Correct several problems with 64-bit architectures introduced in the MBS changes. Patch by Isamu Hasegawa <isamu@yamato.ibm.com>. 2001-02-07 Jakub Jelinek <jakub@redhat.com> * math/tgmath.h: Only add l suffixes if __NO_LONG_DOUBLE_MATH is not defined. * sysdeps/alpha/fpu/bits/mathinline.h: Honour __NO_MATH_INLINES.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/alpha/fpu/bits/mathinline.h8
-rw-r--r--sysdeps/gnu/netinet/tcp.h22
2 files changed, 17 insertions, 13 deletions
diff --git a/sysdeps/alpha/fpu/bits/mathinline.h b/sysdeps/alpha/fpu/bits/mathinline.h
index 065009c..b7d5c3c 100644
--- a/sysdeps/alpha/fpu/bits/mathinline.h
+++ b/sysdeps/alpha/fpu/bits/mathinline.h
@@ -1,5 +1,5 @@
/* Inline math functions for Alpha.
- Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Mosberger-Tang.
@@ -58,6 +58,8 @@
!isunordered(__x, __y) && __x != __y; }))
#endif /* ISO C99 */
+#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__
+
#define __inline_copysign(NAME, TYPE) \
__MATH_INLINE TYPE \
NAME (TYPE __x, TYPE __y) __THROW \
@@ -174,4 +176,6 @@ __MATH_INLINE double fdim (double __x, double __y) __THROW
return __x < __y ? 0.0 : __x - __y;
}
-#endif
+#endif /* C99 */
+
+#endif /* __NO_MATH_INLINES */
diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
index cafb6b1..076e332 100644
--- a/sysdeps/gnu/netinet/tcp.h
+++ b/sysdeps/gnu/netinet/tcp.h
@@ -37,17 +37,17 @@
/*
* User-settable options (used with setsockopt).
*/
-#define TCP_NODELAY 0x01 /* Don't delay send to coalesce packets */
-#define TCP_MAXSEG 0x02 /* Set maximum segment size */
-#define TCP_CORK 0x03 /* Control sending of partial frames */
-#define TCP_KEEPIDLE 0x04 /* Start keeplives after this period */
-#define TCP_KEEPINTVL 0x05 /* Interval between keepalives */
-#define TCP_KEEPCNT 0x06 /* Number of keepalives before death */
-#define TCP_SYNCNT 0x07 /* Number of SYN retransmits */
-#define TCP_LINGER2 0x08 /* Life time of orphaned FIN-WAIT-2 state */
-#define TCP_DEFER_ACCEPT 0x09 /* Wake up listener only when data arrive */
-#define TCP_WINDOW_CLAMP 0x10 /* Bound advertised window */
-#define TCP_INFO 0x11 /* Information about this connection. */
+#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */
+#define TCP_MAXSEG 2 /* Set maximum segment size */
+#define TCP_CORK 3 /* Control sending of partial frames */
+#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
+#define TCP_KEEPINTVL 5 /* Interval between keepalives */
+#define TCP_KEEPCNT 6 /* Number of keepalives before death */
+#define TCP_SYNCNT 7 /* Number of SYN retransmits */
+#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */
+#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */
+#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
+#define TCP_INFO 11 /* Information about this connection. */
#ifdef __USE_MISC
# include <sys/types.h>