Robert Krawitz
2017-05-27 22:16:38 UTC
It is soooooo tempting to minimize the differences between mainline
and branch by sticking
#define stp_dimension_t int
#define stp_resolution_t int
in gutenprint.h on the mainline and merging the resulting changes
(with a few other such things). The idea of using #define rather than
typedef would be to avoid creating a new type (and thereby changing
the API) on the mainline.
While merging hasn't generally been too troublesome, we have had a few
tricky items, and this would cut down on that a lot. There would
still be a few things we can't avoid (such as format strings), but it
would greatly reduce the amount of differences.
and branch by sticking
#define stp_dimension_t int
#define stp_resolution_t int
in gutenprint.h on the mainline and merging the resulting changes
(with a few other such things). The idea of using #define rather than
typedef would be to avoid creating a new type (and thereby changing
the API) on the mainline.
While merging hasn't generally been too troublesome, we have had a few
tricky items, and this would cut down on that a lot. There would
still be a few things we can't avoid (such as format strings), but it
would greatly reduce the amount of differences.
--
Robert Krawitz <***@alum.mit.edu>
*** MIT Engineers A Proud Tradition http://mitathletics.com ***
Member of the League for Programming Freedom -- http://ProgFree.org
Project lead for Gutenprint -- http://gimp-print.sourceforge.net
"Linux doesn't dictate how I work, I dictate how Linux works."
--Eric Crampton
Robert Krawitz <***@alum.mit.edu>
*** MIT Engineers A Proud Tradition http://mitathletics.com ***
Member of the League for Programming Freedom -- http://ProgFree.org
Project lead for Gutenprint -- http://gimp-print.sourceforge.net
"Linux doesn't dictate how I work, I dictate how Linux works."
--Eric Crampton