This fixes a number of things that are warnings in the Mac compiler....

import/cross/targz_generator_test.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 56 matching lines @@
     size_t remaining = write_stream_.GetRemainingByteCount();
     EXPECT_TRUE(bytes_to_process <= remaining);
 
     write_stream_.Write(p, bytes_to_process);
 
     return 0;
   }
 
   // Checks that the data from the reference tar.gz file matches the tar.gz
   // stream we just ge5nerated
-  void            Validate(uint8 *reference_data) {
+  uint8* compressed_data() {
     uint8 *received_data = compressed_data_;
+    return received_data;
+  }
 
-    // on Windows the platform field is different than our reference file
-    received_data[9] = 3;  // Force platform in header to 'UNIX'.
-
-    EXPECT_EQ(0, memcmp(reference_data,
-                        received_data,
-                        compressed_data_.GetLength()));
+  size_t compressed_data_length() {
+    return compressed_data_.GetLength();
   }
 
 #if defined(GENERATE_GOLDEN)
   char* received_data() {
     uint8 *data = compressed_data_;
     data[9] = 3;  // Force platform in header to 'UNIX'.
     return reinterpret_cast<char*>(data);
   }
 
   int received_data_length() {
@@ skipping 52 matching lines @@
 
 #if defined(GENERATE_GOLDEN)
   std::string new_golden_file = *g_program_path +
                                 "/archive_files/new_golden_test2.tar.gz";
   file_util::WriteFile(UTF8ToFilePath(new_golden_file),
                        test_client.received_data(),
                        test_client.received_data_length());
 
 #endif
 
-  test_client.Validate(targz_data);
+  uint8 *received_data = test_client.compressed_data();
+
+  // The platform header in our reference file is set to UNIX, so
+  // force received data to match for all platforms.
+  received_data[9] = 3;
+
+  EXPECT_EQ(0, memcmp(targz_data,
+                      received_data,
+                      test_client.compressed_data_length()));
 
   free(targz_data);
   free(image_data);
   free(audio_data);
   free(shader_data);
 }
 
 }  // namespace o3d