From 06fcd12598c0c5dc263edae2bbddf824c734a4a7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 25 Mar 2002 19:04:30 +0000 Subject: [PATCH] Fixes for MacOSX build. --- include/osg/Math | 2 +- src/osg/Image.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osg/Math b/include/osg/Math index 1f9e2f6e9..13ee35eef 100644 --- a/include/osg/Math +++ b/include/osg/Math @@ -7,7 +7,7 @@ #include -#if defined(WIN32) || defined (macintosh)|| defined (sun) +#if defined(WIN32) || defined (macintosh)|| defined (sun) || defined (__DARWIN_OSX__) #include diff --git a/src/osg/Image.cpp b/src/osg/Image.cpp index 3cfeadcc9..b84bbd35d 100644 --- a/src/osg/Image.cpp +++ b/src/osg/Image.cpp @@ -150,7 +150,7 @@ void Image::ensureDimensionsArePowerOfTwo() float rounded_tp2 = floorf(tp2+0.5f); int new_t = (int)(powf(2.0f,rounded_tp2)); - static int max_size=256; + static GLint max_size=256; static bool init = true; if (init)