Changeset ca44f82 in network-game for common/Common.cpp

Timestamp:

Feb 24, 2013, 1:28:32 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

7b43385

Parents:

3a79253 (diff), 8f85180 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated files to correctly compile on Windows

File:

• common/Common.cpp (modified) (2 diffs)

common/Common.cpp

@@ -1 +1 @@
 #include "Common.h"
+
+#include <iostream>
+using namespace std;
+
+#if defined WINDOWS
+   #include <Windows.h>
+#elif defined LINUX
+   #include <time.h>
+#endif
 
 void set_nonblock(int sock)
@@ -13 +22 @@
    #endif
 }
+
+unsigned long long getCurrentMillis()
+{
+   unsigned long long numMilliseconds;
+
+   #if defined WINDOWS
+      numMilliseconds = GetTickCount();
+   #elif defined LINUX
+      timespec curTime;
+      clock_gettime(CLOCK_REALTIME, &curTime);
+
+      numMilliseconds = curTime.tv_sec*(unsigned long long)1000+curTime.tv_nsec/(unsigned long long)1000000;
+   #endif
+
+   return numMilliseconds;
+}