Changeset 5e693e8 in network-game for common

Timestamp:

Nov 24, 2012, 2:48:40 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

94ebbd9

Parents:

e08572c

git-author:

dportnoy <dmp1488@…> (11/24/12 14:11:41)

git-committer:

dportnoy <dmp1488@…> (11/24/12 14:48:40)

Message:

Added a makefile for the client and made the WSA functions only work on Windows platforms

Location:

common

Files:

• compiler.h (modified) (1 diff)
• message.cpp (modified) (1 diff)
• message.h (modified) (1 diff)

common/compiler.h

@@ -1 +1 @@
 #if defined _WIN64
-        #define WINDOWS
+   #define WINDOWS
 #elif defined _WIN32
-        #define WINDOWS
+   #define WINDOWS
 #elif defined __linux
-        #define LINUX
+   #define LINUX
 #elif defined __unix
-        #define LINUX
+   #define LINUX
 #elif defined __posix
-        #define LINUX
+   #define LINUX
 #endif

common/message.cpp

@@ -4 +4 @@
 
 #if defined WINDOWS
-        #include <winsock2.h>
-        #include <WS2tcpip.h>
+   #include <winsock2.h>
+   #include <WS2tcpip.h>
 #elif defined LINUX
-        #include <sys/socket.h>
-        #include <netinet/in.h>
+   #include <sys/socket.h>
+   #include <netinet/in.h>
 #endif
 
 int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
 {
-        return sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
+   return sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
 }
 
 int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
 {
-        socklen_t socklen = sizeof(struct sockaddr_in);
+   socklen_t socklen = sizeof(struct sockaddr_in);
 
-        // assume we don't care about the value of socklen
-        return recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, &socklen);
+   // assume we don't care about the value of socklen
+   return recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, &socklen);
 }

common/message.h

@@ -6 +6 @@
 typedef struct
 {
-        short type;
-        char buffer[256];
+   short type;
+   char buffer[256];
 } NETWORK_MSG;