common/linux_siginfo.h:54:1: error: "LINUX_SI_TIMER" redefined

["Erik Bertelsen" <bertelsen.erik%gmail.com@localhost>]

On NetBSD/macppc current as of a few hours ago, I see:

dependall ===> usr.bin/kdump
    compile  kdump/setemul.o
In file included from
/home/NetBSD/src/sys/compat/linux/common/linux_types.h:103,
                 from
/home/NetBSD/src/usr.bin/kdump/../../sys/compat/linux/common/linux_signo.c:37,
                 from /home/NetBSD/src/usr.bin/kdump/setemul.c:139:
/home/NetBSD/src/sys/compat/linux/common/linux_siginfo.h:54:1: error:
"LINUX_SI_TIMER" redefined
In file included from
/home/NetBSD/src/sys/compat/linux/common/linux_siginfo.h:42,
                 from
/home/NetBSD/src/sys/compat/linux/common/linux_types.h:103,
                 from
/home/NetBSD/src/usr.bin/kdump/../../sys/compat/linux/common/linux_signo.c:37,
                 from /home/NetBSD/src/usr.bin/kdump/setemul.c:139:
/home/NetBSD/src/sys/compat/linux/arch/powerpc/linux_siginfo.h:107:1:
error: this is the location of the previous definition

*** Failed target:  setemul.o
*** Failed command:
/home/NetBSD/obj.powerpc/tools.4.99.73-powerpc/bin/powerpc--netbsd-gcc
-O2 -fstack-protector -Wstack-protector --param ssp-buffer-size=1
-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
-Wno-sign-compare -Wno-traditional -Wa,--fatal-warnings -Wreturn-type
-Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wextra
-Wno-unused-parameter -Werror -I/home/NetBSD/src/usr.bin/ktrace
-I/home/NetBSD/src/sys -nostdinc -isystem /usr/include
-D_FORTIFY_SOURCE=2 -c /home/NetBSD/src/usr.bin/kdump/setemul.c
*** Error code 1



This could like a fall-out of:


Module Name:    src
Committed By:   njoly
Date:           Sun Oct 19 09:44:31 UTC 2008

Modified Files:
       src/sys/compat/linux/arch/amd64: linux_machdep.c
       src/sys/compat/linux/arch/i386: linux_machdep.c
       src/sys/compat/linux/common: linux_siginfo.h linux_signal.c
           linux_signal.h
       src/sys/compat/linux32/arch/amd64: linux32_machdep.c

Log Message:
Add native to linux siginfo si_code translation, mostly for negative
values. Adjust amd64 and i386 accordingly, not sure about aother archs
i can't test.


- Erik