From: Gareth H. <ga...@va...> - 2001-03-22 17:49:37
|
Karl Schultz wrote: > > __FUNCTION__ is a problem for Windows as well. > > It would be nice to have > > #if defined(VMS) || defined(WIN32) > #define __FUNCTION__ > #endif > > in texutil_tmp.h Sorry, that's my fault. I'm too used to gcc... > Another problem is > > warning C4003: not enough actual parameters for macro > 'ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL' > > which is caused by > > #define ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval) \ > do { \ > if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) { \ > _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" ); \ > return retval; \ > } \ > } while (0) > > #define ASSERT_OUTSIDE_BEGIN_END(ctx) \ > ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,) > > in mtypes.h. > > I think that the code is expanding to what we want, but is just generating a > warning. If we're sure that this is OK, then > > # pragma warning( disable : 4003 ) /* not enough actual parameters for > macro */ > > may be a good addition to glheader.h (under the MESA_MINWARN group) I have new and improved win32 makefiles (in fact, a general cleanup of the old makefiles for DOS, win32 and so on) sitting on my Win2000 partition. I've fixed this as part of that, so next time I boot into that I can commit this. No timeframe for that, of course... -- Gareth |