about summary refs log tree commit diff
path: root/misc/regexp.h
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 /misc/regexp.h
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 'misc/regexp.h')
-rw-r--r--misc/regexp.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/misc/regexp.h b/misc/regexp.h
index 4e3571043c..fc60d3ca51 100644
--- a/misc/regexp.h
+++ b/misc/regexp.h
@@ -142,21 +142,21 @@ compile (char *__restrict instring, char *__restrict expbuf,
       if (__current_size + 1 >= __input_size)
 	{
 	  size_t __new_size = __input_size ? 2 * __input_size : 128;
-	  char *__new_room = alloca (__new_size);
+	  char *__new_room = (char *) alloca (__new_size);
 	  /* See whether we can use the old buffer.  */
 	  if (__new_room + __new_size == __input_buffer)
 	    {
 	      __input_size += __new_size;
-	      __input_buffer = memcpy (__new_room, __input_buffer,
-				       __current_size);
+	      __input_buffer = (char *) memcpy (__new_room, __input_buffer,
+					       __current_size);
 	    }
 	  else if (__input_buffer + __input_size == __new_room)
 	    __input_size += __new_size;
 	  else
 	    {
 	      __input_size = __new_size;
-	      __input_buffer = memcpy (__new_room, __input_buffer,
-				       __current_size);
+	      __input_buffer = (char *) memcpy (__new_room, __input_buffer,
+						__current_size);
 	    }
 	}
       __input_buffer[__current_size++] = __ch;