projects
/
guacd.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
95a5a97
)
Fixed pointer warnings on POSIX and win32
author
Michael Jumper <zhangmaike@users.sourceforge.net>
Fri, 22 Apr 2011 06:49:14 +0000
(23:49 -0700)
committer
Michael Jumper <zhangmaike@users.sourceforge.net>
Fri, 22 Apr 2011 06:49:14 +0000
(23:49 -0700)
src/daemon.c
patch
|
blob
|
history
diff --git
a/src/daemon.c
b/src/daemon.c
index
9f16e8a
..
c4f4661
100644
(file)
--- a/
src/daemon.c
+++ b/
src/daemon.c
@@
-45,9
+45,11
@@
#ifdef __MINGW32__
#include <winsock2.h>
typedef int socklen_t;
#ifdef __MINGW32__
#include <winsock2.h>
typedef int socklen_t;
+typedef char* sockopt_p;
#else
#include <sys/socket.h>
#include <netinet/in.h>
#else
#include <sys/socket.h>
#include <netinet/in.h>
+typedef void* sockopt_p;
#endif
#include <errno.h>
#endif
#include <errno.h>
@@
-119,7
+121,7
@@
int main(int argc, char* argv[]) {
/* Server */
int socket_fd;
struct sockaddr_in server_addr;
/* Server */
int socket_fd;
struct sockaddr_in server_addr;
- const char opt_on[] = {1};
+ int opt_on = 1;
/* Client */
struct sockaddr_in client_addr;
/* Client */
struct sockaddr_in client_addr;
@@
-179,7
+181,7
@@
int main(int argc, char* argv[]) {
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
- if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, opt_on, sizeof(opt_on))) {
+ if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, (sockopt_p) &opt_on, sizeof(opt_on))) {
fprintf(stderr, "Warning: Unable to set socket options for reuse: %s\n", lasterror());
}
fprintf(stderr, "Warning: Unable to set socket options for reuse: %s\n", lasterror());
}