From 7aa6d2082273c05f52f18135f7ab66186f76dc44 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 6 Aug 1999 23:01:00 +0000 Subject: [PATCH] Update. 1999-08-06 Ulrich Drepper * sysdeps/unix/sysv/linux/bits/socket.h: Fix typo (MSG_TRUNC -> MSG_DONTWAIT). --- ChangeLog | 5 +++++ malloc/malloc.c | 1 - sysdeps/unix/sysv/linux/bits/socket.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index afa9e6c..82d73a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-08-06 Ulrich Drepper + + * sysdeps/unix/sysv/linux/bits/socket.h: Fix typo (MSG_TRUNC -> + MSG_DONTWAIT). + 1999-08-06 H.J. Lu * malloc/malloc.c: Initialize __libc_pagesize early. diff --git a/malloc/malloc.c b/malloc/malloc.c index a45480c..eba2a60 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1672,7 +1672,6 @@ ptmalloc_init __MALLOC_P((void)) tsd_key_create(&arena_key, NULL); tsd_setspecific(arena_key, (Void_t *)&main_arena); thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all); -#else /* !defined NO_THREADS */ #endif /* !defined NO_THREADS */ #if defined _LIBC || defined MALLOC_HOOKS if((s = getenv("MALLOC_TRIM_THRESHOLD_"))) diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 056087b..1930670 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -179,7 +179,7 @@ enum MSG_TRUNC = 0x20, #define MSG_TRUNC MSG_TRUNC MSG_DONTWAIT = 0x40, /* Nonblocking IO. */ -#define MSG_DONTWAIT MSG_TRUNC +#define MSG_DONTWAIT MSG_DONTWAIT MSG_EOR = 0x80, /* End of record. */ #define MSG_EOR MSG_EOR MSG_WAITALL = 0x100, /* Wait for a full request. */ -- 2.7.4