On 29.05.2011 04:31, Greg Stein wrote:
On May 28, 2011 1:39 PM, "Stefan Küng" <tortoise...@gmail.com <mailto:tortoise...@gmail.com>> wrote: > > On 28.05.2011 19:33, Daniel Shahaf wrote: >> >> Fair enough. >> >> However, we don't have a practice of keeping declarations without >> corresponding definitions. If that is indeed the case (as opposed to >> definitions which are conditional on preprocessor macros that the >> declaration isn't conditional upon), IMO go ahead and drop the >> declarations. > > > I did a grep search for those functions, and the only files they showed up were the headers, no other files contained those function names. So it's not because of preprocessor conditionals. > > I'll wait until tomorrow. If there are no objections until then, I'll commit a change which removes those. For the conflict_skel functions, please wrap them in #if 0, rather then deleting them. We are going to use them for 1.8. The other two... as you wish.
An #if 0 won't help with extractor.py at all. It will still extract the functions.
If the functions are needed in 1.8, can't we just add them once they're really needed?
Stefan -- ___ oo // \\ "De Chelonian Mobile" (_,\/ \_/ \ TortoiseSVN \ \_/_\_/> The coolest Interface to (Sub)Version Control /_/ \_\ http://tortoisesvn.net