On Mon, Apr 25, 2016 at 03:38:46PM -0700, Kevin J. McCarthy wrote: > Here's a work around I'd like to include in the upcoming 1.6.1 (which > will be based on the stable branch). > > The conflicts currently only affect getdomain.c, but it's a problem > waiting to happen in the other three files, so I think it's better to > just wrap the include. > > Please comment if you think there is a better way to do this. I'm > reluctant to rename the macros since Vincent pointed out this would > break patches.
Well, to be fair, M_ is a pretty crappy prefix to use in a project's macros. Not that using them in system header files is much better... But maybe it wouldn't be such a bad idea to bite the bullet: Do a find/replace of all such macros and change the prefix to MUTT_ instead. With 1.6 freshly out it may not be a bad time to do that, and FWIW if you're ever going to do this, there's no better time than the present. As time goes on, it'll only get harder. As for breaking patches... so? Sure it's a pain, but it's still just a find/replace, with a look over the diff to make sure nothing weird happened. Progress is painful. I would've suggested rewriting in C++ and using namespaces... =8^) I could probably be pursuaded to write a script to do that find and replace, and maybe even run it to generate a patch... -- Derek D. Martin http://www.pizzashack.org/ GPG Key ID: 0xDFBEAD02 -=-=-=-=- This message is posted from an invalid address. Replying to it will result in undeliverable mail due to spam prevention. Sorry for the inconvenience.
pgp3gNVBMUVrY.pgp
Description: PGP signature
