Small cleanup

indra/llcommon/lltimer.cpp

@@ -75,11 +75,12 @@ void ms_sleep(U32 ms)
 	std::this_thread::sleep_for(std::chrono::milliseconds(ms));
 }
 
-void micro_sleep(U64 us, U32 max_yields)
+U32 micro_sleep(U64 us, U32 max_yields)
 {
     // max_yields is unused; just fiddle with it to avoid warnings.
     max_yields = 0;
 	std::this_thread::sleep_for(std::chrono::microseconds(us));
+	return 0;
 }
 
 #elif LL_WINDOWS

indra/llrender/llglslshader.h

@@ -311,7 +311,7 @@ class LLGLSLShader
     LLShaderFeatures mFeatures;
     std::vector< std::pair< std::string, GLenum > > mShaderFiles;
     std::string mName;
-    typedef std::map<std::string, std::string> defines_map_t;
+    typedef std::map<std::string, std::string> defines_map_t; //NOTE: this must be an ordered map to maintain hash consistency
     defines_map_t mDefines;
     static defines_map_t sGlobalDefines;
     LLUUID mShaderHash;