Changeset 34bd549 in network-game for common

Timestamp:

Jun 19, 2014, 1:34:15 AM (10 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

3ea1839

Parents:

883bb5d

Message:

Make client compile on a Mac

Location:

common

Files:

• Common.cpp (modified) (3 diffs)
• Compiler.h (modified) (1 diff)
• MessageContainer.h (modified) (1 diff)
• MessageProcessor.cpp (modified) (1 diff)
• Player.h (modified) (1 diff)

common/Common.cpp

@@ -8 +8 @@
    #include <fcntl.h>
    #include <assert.h>
+#elif defined MAC
+   #include <fcntl.h>
+   #include <assert.h>
+   #include <mach/clock.h>
+   #include <mach/mach.h>
 #endif
 
@@ -50 +55 @@
       assert(flags != -1);
       fcntl(sock, F_SETFL, flags | O_NONBLOCK);
+   #elif defined MAC
+      int flags = fcntl(sock, F_GETFL,0);
+      assert(flags != -1);
+      fcntl(sock, F_SETFL, flags | O_NONBLOCK);
    #endif
 }
@@ -62 +71 @@
       timespec curTime;
       clock_gettime(CLOCK_REALTIME, &curTime);
+
+      numMilliseconds = curTime.tv_sec*(unsigned long long)1000+curTime.tv_nsec/(unsigned long long)1000000;
+   # elif defined MAC
+      timespec curTime;
+
+      clock_serv_t cclock;
+      mach_timespec_t mts;
+      host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+      clock_get_time(cclock, &mts);
+      mach_port_deallocate(mach_task_self(), cclock);
+      curTime.tv_sec = mts.tv_sec;
+      curTime.tv_nsec = mts.tv_nsec;
 
       numMilliseconds = curTime.tv_sec*(unsigned long long)1000+curTime.tv_nsec/(unsigned long long)1000000;

common/Compiler.h

@@ -9 +9 @@
 #elif defined __posix
    #define LINUX
+#elif defined __APPLE__
+   #define MAC
 #endif

common/MessageContainer.h

@@ -9 +9 @@
    #include <winsock2.h>
 #elif defined LINUX
+   #include <netinet/in.h>
+#elif defined MAC
    #include <netinet/in.h>
 #endif

common/MessageProcessor.cpp

@@ -50 +50 @@
 
    // assume we don't care about the value of socklen
+   cout << "Waiting for message from server" << endl;
    int ret =  recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)source, &socklen);
+   cout << "Returned from wait" << endl;
 
    if (ret == -1)

common/Player.h

@@ -10 +10 @@
    #include <winsock2.h>
 #elif defined LINUX
+   #include <netinet/in.h>
+#elif defined MAC
    #include <netinet/in.h>
 #endif