Merge pull request #2729 from ricardoquesada/timeval_64bit_fix

cc_timeval works on 64bit machines, like OS X
2013-06-03 22:47:45 -07:00 · 2013-06-03 22:47:45 -07:00 · c21812b270
parent b3e00a2105 7e7e943699
commit c21812b270
1 changed files with 1 additions and 1 deletions
--- a/cocos2dx/platform/platform.h
+++ b/cocos2dx/platform/platform.h
@ -42,7 +42,7 @@ struct CC_DLL cc_timeval
 #else
    long    tv_sec;        // seconds
 #endif
-    long    tv_usec;    // microSeconds
+    int tv_usec;    // microSeconds
 };

 class CC_DLL CCTime