summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>1999-03-29 02:31:34 +0000
committerAndreas Schwab <schwab@suse.de>1999-03-29 02:31:34 +0000
commitb47516084bfba8471da0bdb58641c0d27e6e48b5 (patch)
treec846204298ae0b690e826115faf106addd005066 /malloc
parentbce4e8006770644963bcf20a3fbe96f46383f76f (diff)
downloadglibc-b47516084bfba8471da0bdb58641c0d27e6e48b5.tar.gz
glibc-b47516084bfba8471da0bdb58641c0d27e6e48b5.tar.xz
glibc-b47516084bfba8471da0bdb58641c0d27e6e48b5.zip
Updated.
1999-03-27  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* malloc/obstack.h (obstack_free): Explicitly convert __obj to
	char * to avoid C++ warning.
	Patch by yasushi@cs.washington.edu [PR libc/1035].

1999-03-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/filesys.texi (Temporary Files): mktemp and mkstemp are
	declared in stdlib.h, correct return value of mkstemp.
	Reported by Andries Brouwer <Andries.Brouwer@cwi.nl>.

	* sysdeps/unix/sysv/linux/net/if_arp.h (ARPHDRD_FC*): New defines
	from Linux 2.2.5.

	* misc/regexp.h (compile): Cast some pointers to (char *) to avoid 
	C++ warning.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/obstack.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/malloc/obstack.h b/malloc/obstack.h
index beb548ecd2..4d49ce024b 100644
--- a/malloc/obstack.h
+++ b/malloc/obstack.h
@@ -1,5 +1,5 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988,89,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+   Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.  Its master source is NOT part of
    the C library, however.  The master source lives in /gd/gnu/lib.
@@ -481,7 +481,7 @@ __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    void *__obj = (OBJ);							\
    if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
-     __o->next_free = __o->object_base = __obj;				\
+     __o->next_free = __o->object_base = (char *)__obj;			\
    else (obstack_free) (__o, __obj); })
 
 #else /* not __GNUC__ or not __STDC__ */