>Number:         29401
>Category:       xsrc
>Synopsis:       Makefiles warnings while compiling X from xsrc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 16 15:30:00 +0000 2005
>Originator:     Nicolas Joly
>Release:        NetBSD 2.99.16
>Organization:
Institut Pasteur, Paris.
>Environment:
System: NetBSD lanfeust.sis.pasteur.fr 2.99.16 NetBSD 2.99.16 (LANFEUST) #7: Wed Feb 16 11:46:16 CET 2005 njoly@lanfeust.sis.pasteur.fr:/local/src/NetBSD/obj/amd64/sys/arch/amd64/compile/LANFEUST amd64
Architecture: x86_64
Machine: amd64
>Description:
I'm getting many warnings during xsrc Makefiles generation on amd64 :

In file included from ../config/cf/Imake.tmpl:104,
                 from Imakefile.c:16:
../config/cf/NetBSD.cf:659: warning: "NetBSDMachineDefines" redefined
../config/cf/NetBSD.cf:328: warning: this is the location of the previous definition

>How-To-Repeat:
cd xsrc && make
>Fix:
Index: xfree/xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvsroot/xsrc/xfree/xc/config/cf/NetBSD.cf,v
retrieving revision 1.75
diff -u -r1.75 NetBSD.cf
--- xfree/xc/config/cf/NetBSD.cf	10 Feb 2005 16:16:24 -0000	1.75
+++ xfree/xc/config/cf/NetBSD.cf	16 Feb 2005 15:11:16 -0000
@@ -324,10 +324,6 @@
 /* End of MACHINE_CPU specific options */
 
 
-#ifndef NetBSDMachineDefines
-#define NetBSDMachineDefines /**/
-#endif
-
 #define StandardDefines	-DCSRG_BASED NetBSDMachineDefines
 
 /* Citrus mb locale were added in 1.5P */
@@ -924,6 +920,9 @@
 #ifndef ServerOSDefines
 # define ServerOSDefines	XFree86ServerOSDefines
 #endif
+#ifndef NetBSDMachineDefines
+#define NetBSDMachineDefines /**/
+#endif
 /* End of MACHINE specific options */
 
 #include <xfree86.cf>