On 20 February 2014 19:45, Peter Maydell <[email protected]> wrote: > The Windows headers provided by MinGW define MOD_SHIFT. Avoid > it by using SPITZ_MOD_* for our constants here. > > Signed-off-by: Peter Maydell <[email protected]> > --- > The other approach would be just to #undef MOD_SHIFT, (and > looking back through the archives I see Stefan posted a patch > to do just that last year) but I think it's cleaner to do this. > > I replaced a few of the /* apostrophe */ keysym names with > the symbols just to keep us under the 80 column limit... > --- > hw/arm/spitz.c | 108 > +++++++++++++++++++++++++++++++-------------------------- > 1 file changed, 58 insertions(+), 50 deletions(-)
I see the patchset to try to reduce the scope where windows.h is pulled in got a bit bogged down in review. Stefan, are you still planning to move forward with that, or should we maybe just apply this patch fror now? I think this is the only w32 build warning currently... thanks -- PMM
