Module Name:    src
Committed By:   plunky
Date:           Tue May  4 09:07:11 UTC 2010

Modified Files:
        src/include: signal.h

Log Message:
handle the difference between C99 and GNUC semantics of inline
functions with external linkage, by using "inline" for STDC and
"extern inline" for GNUC

(as noted by joerg@, using static inline may be clearer)


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/include/signal.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/signal.h
diff -u src/include/signal.h:1.51 src/include/signal.h:1.52
--- src/include/signal.h:1.51	Sun Jan 11 03:04:12 2009
+++ src/include/signal.h	Tue May  4 09:07:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: signal.h,v 1.51 2009/01/11 03:04:12 christos Exp $	*/
+/*	$NetBSD: signal.h,v 1.52 2010/05/04 09:07:11 plunky Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -101,7 +101,11 @@
 #endif
 
 #ifndef _SIGINLINE
+#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
 #define _SIGINLINE extern __inline
+#else
+#define _SIGINLINE __inline
+#endif
 #endif
 
 _SIGINLINE int
@@ -149,7 +153,7 @@
 	__sigfillset(set);
 	return (0);
 }
-#endif /* (__GNUC__ && __STDC__) || _LIBC */
+#endif /* (__GNUC__ && __STDC__) || _SIGINLINE */
 #endif /* !__LIBC12_SOURCE__ */
 
 /*

Reply via email to