From ec4ee5281d28ba17663f08f8ac9167b2af9c8d56 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 29 Mar 2002 12:23:20 +0000 Subject: [PATCH] Fixes for dos endings in MemoryManager.cpp, and compile fix for osgText for Cygwin. --- src/osgText/FTGL.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/osgText/FTGL.h b/src/osgText/FTGL.h index ea174f10b..bdef357db 100644 --- a/src/osgText/FTGL.h +++ b/src/osgText/FTGL.h @@ -33,6 +33,18 @@ #else +#if defined(__CYGWIN__) || defined(__MINGW32__) +# ifndef APIENTRY +# define GLUT_APIENTRY_DEFINED +# define APIENTRY __stdcall +# endif + // XXX This is from Win32's +# ifndef CALLBACK +# define CALLBACK __stdcall +# endif + +#else // ! __CYGWIN__ + // Under windows avoid including // to avoid name space pollution, but Win32's // needs APIENTRY and WINGDIAPI defined properly. @@ -58,6 +70,9 @@ # define CALLBACK # endif # endif + +#endif // __CYGWIN__ + // XXX This is from Win32's and # ifndef WINGDIAPI # define GLUT_WINGDIAPI_DEFINED