diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | malloc/malloc.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index afa9e6c36f..82d73a5229 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-08-06 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/unix/sysv/linux/bits/socket.h: Fix typo (MSG_TRUNC -> + MSG_DONTWAIT). + 1999-08-06 H.J. Lu <hjl@gnu.org> * malloc/malloc.c: Initialize __libc_pagesize early. diff --git a/malloc/malloc.c b/malloc/malloc.c index a45480c59f..eba2a60915 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 056087b2f7..193067001f 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. */ |