projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace MinGW with Windows to avoid ambiguities
[tinc]
/
src
/
sptps_test.c
diff --git
a/src/sptps_test.c
b/src/sptps_test.c
index
1da0571
..
baca66b
100644
(file)
--- a/
src/sptps_test.c
+++ b/
src/sptps_test.c
@@
-25,7
+25,7
@@
#include <getopt.h>
#include <getopt.h>
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
#include <pthread.h>
#endif
#include <pthread.h>
#endif
@@
-37,7
+37,7
@@
#include "utils.h"
#include "names.h"
#include "utils.h"
#include "names.h"
-#ifndef HAVE_
MINGW
+#ifndef HAVE_
WINDOWS
#define closesocket(s) close(s)
#endif
#define closesocket(s) close(s)
#endif
@@
-160,7
+160,7
@@
static void usage(void) {
fprintf(stderr, message, program_name);
}
fprintf(stderr, message, program_name);
}
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
int stdin_sock_fd = -1;
int stdin_sock_fd = -1;
@@
-308,7
+308,7
@@
server_err:
return -1;
}
return -1;
}
-#endif // HAVE_
MINGW
+#endif // HAVE_
WINDOWS
int main(int argc, char *argv[]) {
program_name = argv[0];
int main(int argc, char *argv[]) {
program_name = argv[0];
@@
-428,7
+428,7
@@
int main(int argc, char *argv[]) {
#endif
#endif
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
static struct WSAData wsa_state;
if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
static struct WSAData wsa_state;
if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
@@
-566,7
+566,7
@@
int main(int argc, char *argv[]) {
return 1;
}
return 1;
}
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
if(!readonly) {
in = start_input_reader();
if(!readonly) {
in = start_input_reader();
@@
-607,7
+607,7
@@
int main(int argc, char *argv[]) {
}
if(FD_ISSET(in, &fds)) {
}
if(FD_ISSET(in, &fds)) {
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
ssize_t len = recv(in, buf, readsize, 0);
#else
ssize_t len = read(in, buf, readsize);
ssize_t len = recv(in, buf, readsize, 0);
#else
ssize_t len = read(in, buf, readsize);
@@
-621,7
+621,7
@@
int main(int argc, char *argv[]) {
}
if(len == 0) {
}
if(len == 0) {
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
shutdown(in, SD_SEND);
closesocket(in);
#endif
shutdown(in, SD_SEND);
closesocket(in);
#endif