vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gcc: fix compilation warnings

Browse Source
This commit is contained in:
Erik Faye-Lund 2010-08-26 00:19:19 +02:00
parent d3dd8a78f0
commit 1d4e1bb795
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor.cpp
View File

@ -542,7 +542,7 @@ SOCKET clientConnect(SOCKET serverSocket, sockaddr_in *host)
SOCKET clientSocket = accept(serverSocket, (sockaddr*)&hostTemp, &hostSize); SOCKET clientSocket = accept(serverSocket, (sockaddr*)&hostTemp, &hostSize);
if (INVALID_SOCKET == clientSocket) return INVALID_SOCKET; if (INVALID_SOCKET == clientSocket) return INVALID_SOCKET;
const char *expectedGreeting = client_greet; const char *expectedGreeting = CLIENT_GREET;
char recievedGreeting[128]; char recievedGreeting[128];
recv(clientSocket, recievedGreeting, int(strlen(expectedGreeting)), 0); recv(clientSocket, recievedGreeting, int(strlen(expectedGreeting)), 0);
@ -553,7 +553,7 @@ SOCKET clientConnect(SOCKET serverSocket, sockaddr_in *host)
return INVALID_SOCKET; return INVALID_SOCKET;
} }
const char *greeting = server_greet; const char *greeting = SERVER_GREET;
send(clientSocket, greeting, int(strlen(greeting)), 0); send(clientSocket, greeting, int(strlen(greeting)), 0);
if (NULL != host) *host = hostTemp; if (NULL != host) *host = hostTemp;

3
example_bass/example_bass.cpp
View File

@ -168,7 +168,8 @@ int main(int argc, char *argv[])
D3DXVECTOR3 at(0, 0, 0); D3DXVECTOR3 at(0, 0, 0);
D3DXVECTOR3 up(0, 1, 0); D3DXVECTOR3 up(0, 1, 0);
D3DXMATRIX view; D3DXMATRIX view;
D3DXMatrixLookAtLH(&view, &(eye + at), &at, &up); D3DXVECTOR3 dir = eye + at;
D3DXMatrixLookAtLH(&view, &dir, &at, &up);
dev->SetTransform(D3DTS_VIEW, &view); dev->SetTransform(D3DTS_VIEW, &view);
D3DXMATRIX proj; D3DXMATRIX proj;

4
sync/base.h
View File

@ -26,8 +26,8 @@
#define closesocket(x) close(x) #define closesocket(x) close(x)
#endif #endif
static const char *client_greet = "hello, synctracker!"; #define CLIENT_GREET "hello, synctracker!"
static const char *server_greet = "hello, demo!"; #define SERVER_GREET "hello, demo!"
enum { enum {
SET_KEY = 0, SET_KEY = 0,

10
sync/device.c
View File

@ -60,11 +60,11 @@ static SOCKET server_connect(const char *host, unsigned short nport)
if (sock == INVALID_SOCKET) if (sock == INVALID_SOCKET)
return INVALID_SOCKET; return INVALID_SOCKET;
if (xsend(sock, client_greet, strlen(client_greet), 0) || if (xsend(sock, CLIENT_GREET, strlen(CLIENT_GREET), 0) ||
xrecv(sock, greet, strlen(server_greet), 0)) xrecv(sock, greet, strlen(SERVER_GREET), 0))
return INVALID_SOCKET; return INVALID_SOCKET;
if (!strncmp(server_greet, greet, strlen(server_greet))) if (!strncmp(SERVER_GREET, greet, strlen(SERVER_GREET)))
return sock; return sock;
closesocket(sock); closesocket(sock);
@ -200,7 +200,7 @@ static int handle_set_key_cmd(SOCKET sock, struct sync_data *data)
key.value = v.f; key.value = v.f;
assert(type < KEY_TYPE_COUNT); assert(type < KEY_TYPE_COUNT);
assert(track < (int)data->num_tracks); assert(track < data->num_tracks);
key.type = (enum key_type)type; key.type = (enum key_type)type;
sync_set_key(data->tracks[track], &key); sync_set_key(data->tracks[track], &key);
return 1; return 1;
@ -217,7 +217,7 @@ static int handle_del_key_cmd(SOCKET sock, struct sync_data *data)
track = ntohl(track); track = ntohl(track);
row = ntohl(row); row = ntohl(row);
assert(track < (int)data->num_tracks); assert(track < data->num_tracks);
sync_del_key(data->tracks[track], row); sync_del_key(data->tracks[track], row);
return 1; return 1;
} }