Fixing mac and linux build

Review URL: http://codereview.chromium.org/186020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25247 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 4 deletions

diff --git a/o3d/core/cross/message_commands.h b/o3d/core/cross/message_commands.h
index 712e7b5..0a069ed 100644
--- a/o3d/core/cross/message_commands.h
+++ b/o3d/core/cross/message_commands.h
@@ -39,6 +39,10 @@
 

 namespace o3d {

 

+// Max length of the string storing the version of O3D as returned by the

+// GET_VERSION message

+#define MAX_VERSION_STRING_LENGTH 128

+

 // Make sure the compiler does not add extra padding to any of the message

 // structures.

 O3D_PUSH_STRUCTURE_PACKING_1;

@@ -365,11 +369,10 @@ struct MessageGetVersion {
 

   // The response data.

   struct ResponseData {

-    static const size_t kMaxVersionLength = 128;

     // a null terminated version string in the format "x.x.x.x" where x is an

     // integer number. Note: There may be other data after the last digit which

     // is currently undefined.

-    char version[kMaxVersionLength];

+    char version[MAX_VERSION_STRING_LENGTH];

   };

 

   // A wrapper to manage the response data.

diff --git a/o3d/core/cross/message_queue.cc b/o3d/core/cross/message_queue.cc
index 8c0bb3e..a70aca1 100644
--- a/o3d/core/cross/message_queue.cc
+++ b/o3d/core/cross/message_queue.cc
@@ -834,8 +834,7 @@ bool MessageQueue::ProcessMessageGetVersion(
   }
 
   // Send the version string.
-  DCHECK_LT(strlen(version),
-            MessageGetVersion::ResponseData::kMaxVersionLength);
+  DCHECK_LT(strlen(version), MAX_VERSION_STRING_LENGTH);
   MessageGetVersion::Response response(version);
 
   nacl::MessageHeader response_header;