summary refs log tree commit diff
path: root/stdio/stdio.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-06-14 17:15:57 +0000
committerRoland McGrath <roland@gnu.org>1995-06-14 17:15:57 +0000
commitd6e2f671f716a25188d83350fa517ae9ea29f70f (patch)
tree174344177defa77e2bbdc3f172ee33e03a933d5f /stdio/stdio.h
parent5e75b23212343257fda8bea933521b0b7c5cdef6 (diff)
downloadglibc-d6e2f671f716a25188d83350fa517ae9ea29f70f.tar.gz
glibc-d6e2f671f716a25188d83350fa517ae9ea29f70f.tar.xz
glibc-d6e2f671f716a25188d83350fa517ae9ea29f70f.zip
Wed Jun 14 03:45:24 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	* stdio/stdio.h (__validfp): Use ({...}) rather than a comma
 	expression, to avoid gcc's "value computed is not used" warning.

	* libc-symbols.h (_elf_set_element): Give the set-element variable
 	an `unused' attribute.

	* hurd/hurd/threadvar.h (__hurd_threadvar_location): Declare with
 	__attribute__ ((__const__)).
	* hurd/hurd/signal.h (_hurd_self_sigstate): Likewise.

	* hurd/hurd/userlink.h (_hurd_userlink_link): Properly set
 	LINK->resource.next->resource.prevp when appropriate, not
 	LINK->resource.next->thread.prevp!!!
Diffstat (limited to 'stdio/stdio.h')
-rw-r--r--stdio/stdio.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/stdio/stdio.h b/stdio/stdio.h
index 2994432328..a36081d2d4 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -213,9 +213,9 @@ struct __stdio_file
    See stdio/glue.c for what the confusing bit is about.  */
 #define	__validfp(stream)						      \
   (stream != NULL &&							      \
-   ((stream->__magic == _GLUEMAGIC &&					      \
-     (stream = *(((struct { int __magic; FILE **__p; } *) stream)->__p))),    \
-    (stream->__magic == _IOMAGIC)))
+   ({ if (stream->__magic == _GLUEMAGIC)				      \
+	stream = *((struct { int __magic; FILE **__p; } *) stream)->__p;      \
+      stream->__magic == _IOMAGIC; }))
 
 /* Clear the error and EOF indicators of STREAM.  */
 #define	__clearerr(stream)	((stream)->__error = (stream)->__eof = 0)