Merge pull request #281 from sergiud/msvc-error-define

Fixed undeclared identifier error

diff --combined src/logging_unittest.cc
index 59e9155,aec8ef4..6c9445c
--- 1/src/logging_unittest.cc
--- 2/src/logging_unittest.cc
+++ b/src/logging_unittest.cc
@@@ -273,7 -273,7 +273,7 @@@ void TestLogging(bool check_counts) 
               << setw(1) << hex << j;
  
    {
-     google::LogMessage outer(__FILE__, __LINE__, google::ERROR);
+     google::LogMessage outer(__FILE__, __LINE__, GLOG_ERROR);
      outer.stream() << "outer";
  
      LOG(ERROR) << "inner";
@@@ -775,18 -775,17 +775,18 @@@ static void TestOneTruncate(const char 
    CHECK_ERR(fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0600));
  
    const char *discardstr = "DISCARDME!", *keepstr = "KEEPME!";
 +  const size_t discard_size = strlen(discardstr), keep_size = strlen(keepstr);
  
    // Fill the file with the requested data; first discard data, then kept data
    int64 written = 0;
    while (written < dsize) {
 -    int bytes = min<int64>(dsize - written, strlen(discardstr));
 +    int bytes = min<int64>(dsize - written, discard_size);
      CHECK_ERR(write(fd, discardstr, bytes));
      written += bytes;
    }
    written = 0;
    while (written < ksize) {
 -    int bytes = min<int64>(ksize - written, strlen(keepstr));
 +    int bytes = min<int64>(ksize - written, keep_size);
      CHECK_ERR(write(fd, keepstr, bytes));
      written += bytes;
    }
@@@ -808,7 -807,7 +808,7 @@@
    const char *p = buf;
    int64 checked = 0;
    while (checked < expect) {
 -    int bytes = min<int64>(expect - checked, strlen(keepstr));
 +    int bytes = min<int64>(expect - checked, keep_size);
      CHECK(!memcmp(p, keepstr, bytes));
      checked += bytes;
    }