Changeset cdb4bec in network-game for common/Common.h

Timestamp:

Dec 9, 2012, 8:59:18 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3f5616f

Parents:

da692b9 (diff), e607c0f (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:

Merge branch 'master' of github.com:weretaco/network-game

File:

• common/Common.h (modified) (1 diff)

common/Common.h

@@ -4 +4 @@
 void set_nonblock(int sock)
 {
-    int flags;
-    flags = fcntl(sock, F_GETFL,0);
-    assert(flags != -1);
-    fcntl(sock, F_SETFL, flags | O_NONBLOCK);
+   #ifdef WIN32
+      unsigned long mode = 1;
+      ioctlsocket(sock, FIONBIO, &mode);
+   #else
+      int flags;
+      flags = fcntl(sock, F_GETFL,0);
+      assert(flags != -1);
+      fcntl(sock, F_SETFL, flags | O_NONBLOCK);
+   #endif
 }