Alan, I can fix the later part of this one by simply removing the use of __FUNCTION__ in the debug messages.
-Brian Alan Coopersmith wrote: > Signed-off-by: Alan Coopersmith <[email protected]> > --- > include/EGL/eglplatform.h | 2 +- > src/egl/main/eglconfigutil.c | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 1 deletions(-) > > diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h > index 0f34da0..b6311f8 100644 > --- a/include/EGL/eglplatform.h > +++ b/include/EGL/eglplatform.h > @@ -68,7 +68,7 @@ typedef HWND NativeWindowType; > typedef HBITMAP NativePixmapType; > /** END Added for Windows **/ > > -#elif defined(__gnu_linux__) || defined(__FreeBSD__) > +#elif defined(__gnu_linux__) || defined(__FreeBSD__) || defined(__sun) > > /** BEGIN Added for X (Mesa) **/ > #ifndef EGLAPI > diff --git a/src/egl/main/eglconfigutil.c b/src/egl/main/eglconfigutil.c > index 7061df6..a3990b0 100644 > --- a/src/egl/main/eglconfigutil.c > +++ b/src/egl/main/eglconfigutil.c > @@ -9,6 +9,20 @@ > #include "eglconfigutil.h" > #include "egllog.h" > > +/* copied from src/mesa/main/compiler.h */ > +#ifndef __FUNCTION__ > +# if defined(__VMS) > +# define __FUNCTION__ "VMS$NL:" > +# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \ > + (!defined(_MSC_VER) || _MSC_VER < 1300) > +# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \ > + (defined(__SUNPRO_C) && defined(__C99FEATURES__)) > +# define __FUNCTION__ __func__ > +# else > +# define __FUNCTION__ "<unknown>" > +# endif > +# endif > +#endif > > /** > * Convert an _EGLConfig to a __GLcontextModes object. ------------------------------------------------------------------------------ Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are powering Web 2.0 with engaging, cross-platform capabilities. Quickly and easily build your RIAs with Flex Builder, the Eclipse(TM)based development software that enables intelligent coding and step-through debugging. Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
