diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 57a2c9d1ba1f2b4ecd97aba9e44599d83473a990..ea0f2523a05cc6683bb015fecb29972f5ef5762f 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -38,7 +38,10 @@
 #include "llmatrix4a.h"
 #include "alglmath.h"
 
-#if LL_WINDOWS
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
 extern void APIENTRY gl_debug_callback(GLenum source,
                                 GLenum type,
                                 GLuint id,
@@ -47,7 +50,6 @@ extern void APIENTRY gl_debug_callback(GLenum source,
                                 const GLchar* message,
                                 GLvoid* userParam)
 ;
-#endif
 
 thread_local LLRender gGL;
 
@@ -873,14 +875,12 @@ LLRender::~LLRender()
 
 void LLRender::init(bool needs_vertex_buffer)
 {
-#if 1
     if (gGLManager.mHasDebugOutput && gDebugGL)
     { //setup debug output callback
         //glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_LOW_ARB, 0, NULL, GL_TRUE);
         glDebugMessageCallbackARB((GLDEBUGPROCARB) gl_debug_callback, NULL);
         glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
     }
-#endif
 
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);