Dear Scott, In message <1403637570.26908.38.ca...@snotra.buserror.net> you wrote: > > I still disagree with #ifndef __UBOOT__ as it will hurt more than it > helps with future merges.
I agree that #ifdef's should be avoided, but then here they also serve a documentation purpose as they clearly mark areas of code that are specific to U-Boot, or that are not used in U-Boot. Do you think just of a removal, so there will be no trace left of which code was added for U-Boot, and which was removed? Or should these be turned into comments, something like /* BEGIN U-Boot specific code */ ... /* END U-Boot specific code */ [but that would not handle code removal well]. So what exactly is your proposal how the #fdef's should be removed? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de It's not what you do, it's how you do what you do! - Jordan D. Ulmer _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot