diff --git a/src/LoadOGL.h b/src/LoadOGL.h
index 18dd25d..db05586 100644
--- a/src/LoadOGL.h
+++ b/src/LoadOGL.h
@@ -346,7 +346,7 @@ ANT_GL_DECL(void, glTexGenf, (GLenum coord, GLenum pname, GLfloat param))
 ANT_GL_DECL(void, glTexGenfv, (GLenum coord, GLenum pname, const GLfloat *params))
 ANT_GL_DECL(void, glTexGeni, (GLenum coord, GLenum pname, GLint param))
 ANT_GL_DECL(void, glTexGeniv, (GLenum coord, GLenum pname, const GLint *params))
-#if defined(ANT_OSX)
+#if defined(ANT_OSX) && (MAC_OS_X_VERSION_MAX_ALLOWED < 1070) // Mac OS X 10.7
 // Mac OSX redefined these OpenGL calls: glTexImage1D, glTexImage2D
 ANT_GL_DECL(void, glTexImage1D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels))
 ANT_GL_DECL(void, glTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels))
diff --git a/src/TwMgr.h b/src/TwMgr.h
index 904e887..08cf403 100644
--- a/src/TwMgr.h
+++ b/src/TwMgr.h
@@ -354,7 +354,8 @@ const TwType TW_TYPE_CSSTRING_MAX   = TW_TYPE_CSSTRING(0xfffffff);
 #define TW_CSSTRING_SIZE(type)      ((int)((type)&0xfffffff))
 const TwType TW_TYPE_CUSTOM_BASE    = TwType(0x40000000);

-extern "C" int ANT_CALL TwSetLastError(const char *_StaticErrorMessage);
+//extern "C" int ANT_CALL TwSetLastError(const char *_StaticErrorMessage);
+int ANT_CALL TwSetLastError(const char *_StaticErrorMessage);

 const TwGraphAPI TW_OPENGL_CORE = (TwGraphAPI)5; // WIP (note: OpenGL Core Profil requires OpenGL 3.2 or later)