2 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h
index 5b149c9..ce2865b 100644
--- a/linden/indra/llwindow/GL/glh_extensions.h
+++ b/linden/indra/llwindow/GL/glh_extensions.h
@@ -111,7 +111,9 @@ static const char* EatNonWhiteSpace(const char *str)
 int glh_init_extensions(const char *origReqExts)
 {
         // Length of requested extensions string
+        /*
         unsigned reqExtsLen;
+        */
         char *reqExts;
         // Ptr for individual extensions within reqExts
         char *reqExt;
@@ -153,8 +155,8 @@ int glh_init_extensions(const char *origReqExts)
                 return TRUE;
         }
         reqExts = strdup(origReqExts);
-        reqExtsLen = (S32)strlen(reqExts);
         /*
+        reqExtsLen = (S32)strlen(reqExts);
         if (NULL == gGLHExts.mUnsupportedExts)
         {
                 gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1);
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 58090b3..6717f7b 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -2518,9 +2518,10 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
         sortpat = FcNameParse((FcChar8*) sort_order.c_str());
         if (sortpat)
         {
+                FcResult dummyResult;
                 // Sort the list of system fonts from most-to-least-desirable.
                 fs = FcFontSort(NULL, sortpat, elide_unicode_coverage,
-                                NULL, NULL);
+                                NULL, &dummyResult);
                 FcPatternDestroy(sortpat);
         }