Merge pull request #2357 from mgreter/netbsd-2120

Fix compiler issue with spec regression on NetBSD 6.1

Author: mgreter

src/lexer.cpp

@@ -79,26 +79,29 @@ namespace Sass {
     // but with specific ranges (copied from Ruby Sass)
     bool is_nonascii(const char& chr)
     {
+      unsigned int cmp = unsigned(chr);
       return (
-        (unsigned(chr) >= 128 && unsigned(chr) <= 15572911) ||
-        (unsigned(chr) >= 15630464 && unsigned(chr) <= 15712189) ||
-        (unsigned(chr) >= 4036001920)
+        (cmp >= 128 && cmp <= 15572911) ||
+        (cmp >= 15630464 && cmp <= 15712189) ||
+        (cmp >= 4036001920)
       );
     }
 
     // check if char is within a reduced ascii range
     // valid in a uri (copied from Ruby Sass)
     bool is_uri_character(const char& chr)
     {
-      return (unsigned(chr) > 41 && unsigned(chr) < 127) ||
-             unsigned(chr) == ':' || unsigned(chr) == '/';
+      unsigned int cmp = unsigned(chr);
+      return (cmp > 41 && cmp < 127) ||
+             cmp == ':' || cmp == '/';
     }
 
     // check if char is within a reduced ascii range
     // valid for escaping (copied from Ruby Sass)
     bool is_escapable_character(const char& chr)
     {
-      return unsigned(chr) > 31 && unsigned(chr) < 127;
+      unsigned int cmp = unsigned(chr);
+      return cmp > 31 && cmp < 127;
     }
 
     // Match word character (look ahead)

src/util.cpp

@@ -292,7 +292,7 @@ namespace Sass {
           // convert the whole output from string to a stream!?
           // allocate memory for utf8 char and convert to utf8
           unsigned char u[5] = {0,0,0,0,0}; utf8::append(cp, u);
-          for(size_t m = 0; u[m] && m < 5; m++) unq.push_back(u[m]);
+          for(size_t m = 0; m < 5 && u[m]; m++) unq.push_back(u[m]);
 
           // skip some more chars?
           i += len - 1; skipped = false;