Re: -current's /usr/include/sys/lwp.h causes compile problems in pkgsrc

[Tobias Nygren <tnn%NetBSD.org@localhost>]

On Sun, 29 Nov 2009 13:59:42 +0100
Markus W Kilbinger <mk%kilbi.de@localhost> wrote:

> Hi!
> 
> -current's actual /usr/include/sys/lwp.h produces problems when
> compiling several pkgsrc packages, e. g. pkgsrc/www/seamonkey:
> 
>   cc -o prsystem.o -c -fvisibility=hidden   -I/usr/pkg/include -I/usr/include 
> -I/usr/pkg/include/python2.5 -I/usr/X11R7/include 
> -I/usr/X11R7/include/freetype2 -O2 -I/usr/pkg/include -I/usr/include 
> -I/usr/pkg/include/python2.5 -I/usr/X11R7/include 
> -I/usr/X11R7/include/freetype2 -ansi -Wall -pthread -O2 -fPIC -DPIC  -UDEBUG  
> -DMOZILLA_CLIENT=1 -DNDEBUG=1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=1 
> -DHAVE_VISIBILITY_PRAGMA=1 -DXP_UNIX=1 -DNETBSD=1 -DHAVE_BSD_FLOCK=1 
> -DHAVE_SOCKLEN_T=1 -DHAVE_LCHOWN=1 -DHAVE_STRERROR=1  -DFORCE_PR_LOG 
> -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM -D_NSPR_BUILD_ 
> -I/usr/obj/pkg/www/seamonkey/work.x86_64/comm-1.9.1/mozilla/dist/include/nspr 
> -I../../../pr/include -I../../../pr/include/private  prsystem.c
>   In file included from /usr/include/sys/proc.h:83,
>                    from /usr/include/sys/sysctl.h:46,
>                    from prsystem.c:62:
>   /usr/include/sys/lwp.h:200: error: expected '=', ',', ';', 'asm' or 
> '__attribute__' before 'void'
>   make[6]: *** [prsystem.o] Error 1
>   make[6]: Leaving directory 
> ``/usr/obj/pkg/www/seamonkey/work.x86_64/comm-1.9.1/mozilla/nsprpub/pr/src/misc'
>   make[5]: *** [export] Error 2
> 
> Anybody knows how to solve this?

Something like this?

Index: lwp.h
===================================================================
RCS file: /cvsroot/src/sys/sys/lwp.h,v
retrieving revision 1.126
diff -u -r1.126 lwp.h
--- lwp.h       25 Nov 2009 13:53:19 -0000      1.126
+++ lwp.h       29 Nov 2009 14:40:34 -0000
@@ -197,7 +197,11 @@
 #define        UAREA_TO_USER(uarea)    ((struct user *)((uarea) +
UAREA_USER_OFFSET)) #endif /* !defined(UAREA_TO_USER) */
 
-static inline void *
+#ifdef __GNUC__
+static __inline__ void *
+#else
+static void *
+#endif
 lwp_getpcb(struct lwp *l)
 {