Re: [Xenomai] include guard trank/posix/pthread.h

[Philippe Gerum <rpm@xenomai.org>]

On 06/22/2015 12:26 PM, Philippe Gerum wrote:
> On 06/22/2015 11:54 AM, Frederik Bayart wrote:
>>
>>
>>
>> On Friday, 19 June 2015, 15:07, Philippe Gerum <rpm@xenomai.org> wrote:
>>> On 06/19/2015 03:02 PM, Frederik Bayart wrote:
>>>
>>>
>>>
>>>
>>>> Hallo,
>>>> I noticed that both /usr/xenomai/include/trank/trank.h and  /usr/xenomai/include/trank/posix/pthread.h share the same include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error ? I use compile flags 'xeno-config --skin=native --cflags' and get compile errors. If I change the include guard of pthread.h to _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be solved.In attachment a diff with my changes.
>>>> Frederik
>>>>
>>>
>>> Yes, the guard is definitely wrong, will fix. Thanks for pointing this out.
>>>
>>> -- 
>>> Philippe.
>>
>> In the same context : to make it compile, I had to add
>> /usr/xenomai/include/trank/posix to
>>  $(shell xeno-config --skin=native --cflags).
>> At the moment -I/usr/xenomai/include/trank -D__XENO_COMPAT__
>>  -I/usr/xenomai/include/cobalt -I/usr/xenomai/include -D_GNU_SOURCE
>>  -D_REENTRANT -D__COBALT__ -I/usr/xenomai/include/alchemy
>> is returned.
>>
>> If this is the correct solution, I can prepare a patch for
>>  xeno-config if desired.
>>
> 
> Please do.
> 

-rc5 is ready and I don't want to hold it for too long, so if possible,
any feedback regarding this asap would be great. By default, I'll merge
the patch below, which should address this issue.

diff --git a/scripts/xeno-config-cobalt.in b/scripts/xeno-config-cobalt.in
index c6e51d1..7b623db 100644
--- a/scripts/xeno-config-cobalt.in
+++ b/scripts/xeno-config-cobalt.in
@@ -198,7 +198,10 @@ if test x$do_cflags = xy; then
     test x$compat = xy && cflags="-I$XENO_INCLUDE_DIR/trank
-D__XENO_COMPAT__ $cflags"
     for skin in $skin_list; do
 	case "$skin" in
-	    posix|cobalt|rtdm)
+	    posix|rtdm)
+		test x$compat = xy && cflags="$cflags -I$XENO_INCLUDE_DIR/trank/posix"
+		;;
+	    cobalt)
 		;;
 	    vxworks|psos|alchemy|smokey)
 		cflags="$cflags -I$XENO_INCLUDE_DIR/$skin"

-- 
Philippe.