toolchain/46837: redefinition of BOOTSEL in sbin/fdisk/fdisk.c during TOOL compilation

[Wolfgang.Stukenbrock%nagler-company.com@localhost]

>Number:         46837
>Category:       toolchain
>Synopsis:       redefinition of BOOTSEL in sbin/fdisk/fdisk.c during TOOL 
>compilation
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    toolchain-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 25 09:55:00 +0000 2012
>Originator:     Wolfgang Stukenbrock
>Release:        NetBSD 5.1_STABLE
>Organization:
Dr. Nagler & Company GmbH
>Environment:
        
        
System: NetBSD s012 4.0 NetBSD 4.0 (NSW-S012) #11: Fri Mar 26 15:01:49 CET 2010 
root@s012:/usr/src/sys/arch/amd64/compile/NSW-S012 amd64
Architecture: x86_64
Machine: amd64
>Description:
        During compilation of tool chain the compiler complains about a 
redifinition of BOOTSEL
        in sbin/fdisk/fdisk.c.
>How-To-Repeat:
        Get 5_1_STABLE sources and compile it. (on a 4.0 system - if this is 
relevant).
        You will see the following messages:
/export/NetBSD-5.1.2/src/tools/fdisk/../../sbin/fdisk/fdisk.c:95:1: warning: 
"BOOTSEL" redefined
<command line>:1:1: warning: this is the location of the previous definition
>Fix:
        The following patch will fix this issue by defining BOOTSEL only if not 
already defined
        in fdisk.c

--- fdisk.c     2010/12/09 11:09:22     1.2
+++ fdisk.c     2012/08/25 09:44:55
@@ -92,8 +92,10 @@
 #if !HAVE_NBTOOL_CONFIG_H
 #include <machine/cpu.h>
 #endif /* !HAVE_NBTOOL_CONFIG_H */
+#ifndef BOOTSEL
 #define BOOTSEL
 #endif
+#endif
 
 #ifdef BOOTSEL

>Unformatted: