Begin support for mingw stratum build. Conflicts: configure.ac
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251
diff --git a/api.c b/api.c
index f8171e0..f81eced 100644
--- a/api.c
+++ b/api.c
@@ -44,6 +44,80 @@
// However lots of PGA's may mean more
#define QUEUE 100
+#if defined WIN32
+static char WSAbuf[1024];
+
+struct WSAERRORS {
+ int id;
+ char *code;
+} WSAErrors[] = {
+ { 0, "No error" },
+ { WSAEINTR, "Interrupted system call" },
+ { WSAEBADF, "Bad file number" },
+ { WSAEACCES, "Permission denied" },
+ { WSAEFAULT, "Bad address" },
+ { WSAEINVAL, "Invalid argument" },
+ { WSAEMFILE, "Too many open sockets" },
+ { WSAEWOULDBLOCK, "Operation would block" },
+ { WSAEINPROGRESS, "Operation now in progress" },
+ { WSAEALREADY, "Operation already in progress" },
+ { WSAENOTSOCK, "Socket operation on non-socket" },
+ { WSAEDESTADDRREQ, "Destination address required" },
+ { WSAEMSGSIZE, "Message too long" },
+ { WSAEPROTOTYPE, "Protocol wrong type for socket" },
+ { WSAENOPROTOOPT, "Bad protocol option" },
+ { WSAEPROTONOSUPPORT, "Protocol not supported" },
+ { WSAESOCKTNOSUPPORT, "Socket type not supported" },
+ { WSAEOPNOTSUPP, "Operation not supported on socket" },
+ { WSAEPFNOSUPPORT, "Protocol family not supported" },
+ { WSAEAFNOSUPPORT, "Address family not supported" },
+ { WSAEADDRINUSE, "Address already in use" },
+ { WSAEADDRNOTAVAIL, "Can't assign requested address" },
+ { WSAENETDOWN, "Network is down" },
+ { WSAENETUNREACH, "Network is unreachable" },
+ { WSAENETRESET, "Net connection reset" },
+ { WSAECONNABORTED, "Software caused connection abort" },
+ { WSAECONNRESET, "Connection reset by peer" },
+ { WSAENOBUFS, "No buffer space available" },
+ { WSAEISCONN, "Socket is already connected" },
+ { WSAENOTCONN, "Socket is not connected" },
+ { WSAESHUTDOWN, "Can't send after socket shutdown" },
+ { WSAETOOMANYREFS, "Too many references, can't splice" },
+ { WSAETIMEDOUT, "Connection timed out" },
+ { WSAECONNREFUSED, "Connection refused" },
+ { WSAELOOP, "Too many levels of symbolic links" },
+ { WSAENAMETOOLONG, "File name too long" },
+ { WSAEHOSTDOWN, "Host is down" },
+ { WSAEHOSTUNREACH, "No route to host" },
+ { WSAENOTEMPTY, "Directory not empty" },
+ { WSAEPROCLIM, "Too many processes" },
+ { WSAEUSERS, "Too many users" },
+ { WSAEDQUOT, "Disc quota exceeded" },
+ { WSAESTALE, "Stale NFS file handle" },
+ { WSAEREMOTE, "Too many levels of remote in path" },
+ { WSASYSNOTREADY, "Network system is unavailable" },
+ { WSAVERNOTSUPPORTED, "Winsock version out of range" },
+ { WSANOTINITIALISED, "WSAStartup not yet called" },
+ { WSAEDISCON, "Graceful shutdown in progress" },
+ { WSAHOST_NOT_FOUND, "Host not found" },
+ { WSANO_DATA, "No host data of that type was found" },
+ { -1, "Unknown error code" }
+};
+
+char *WSAErrorMsg(void) {
+ int i;
+ int id = WSAGetLastError();
+
+ /* Assume none of them are actually -1 */
+ for (i = 0; WSAErrors[i].id != -1; i++)
+ if (WSAErrors[i].id == id)
+ break;
+
+ sprintf(WSAbuf, "Socket Error: (%d) %s", id, WSAErrors[i].code);
+
+ return &(WSAbuf[0]);
+}
+#endif
static char *io_buffer = NULL;
static char *msg_buffer = NULL;
static SOCKETTYPE sock = INVSOCK;
diff --git a/configure.ac b/configure.ac
index fe618e0..f9fc107 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,7 @@ case $target in
PTHREAD_FLAGS=""
DLOPEN_FLAGS=""
WS2_LIBS="-lws2_32"
+ AC_DEFINE([_WIN32_WINNT], [0x0501], "WinNT version for XP+ support")
;;
powerpc-*-darwin*)
CFLAGS="$CFLAGS -faltivec"
diff --git a/driver-icarus.c b/driver-icarus.c
index 4214c31..2cc2a45 100644
--- a/driver-icarus.c
+++ b/driver-icarus.c
@@ -29,6 +29,8 @@
* nonce range is completely calculated.
*/
+#include "config.h"
+
#include <limits.h>
#include <pthread.h>
#include <stdio.h>
diff --git a/logging.c b/logging.c
index 47d1970..afc7008 100644
--- a/logging.c
+++ b/logging.c
@@ -7,6 +7,8 @@
* any later version. See COPYING for more details.
*/
+#include "config.h"
+
#include <unistd.h>
#include "logging.h"
diff --git a/miner.h b/miner.h
index 501badf..7bf1309 100644
--- a/miner.h
+++ b/miner.h
@@ -52,6 +52,19 @@ void *alloca (size_t);
# endif
#endif
+#ifdef __MINGW32__
+#include <windows.h>
+#include <io.h>
+static inline int fsync (int fd)
+{
+ return (FlushFileBuffers ((HANDLE) _get_osfhandle (fd))) ? 0 : -1;
+}
+
+#ifndef MSG_DONTWAIT
+# define MSG_DONTWAIT 0x1000000
+#endif
+#endif /* __MINGW32__ */
+
#if defined (__linux)
#ifndef LINUX
#define LINUX
diff --git a/util.c b/util.c
index 6912531..b11c116 100644
--- a/util.c
+++ b/util.c
@@ -26,11 +26,12 @@
# include <sys/socket.h>
# include <netinet/in.h>
# include <netinet/tcp.h>
+# include <netdb.h>
#else
# include <winsock2.h>
# include <mstcpip.h>
+# include <ws2tcpip.h>
#endif
-#include <netdb.h>
#include "miner.h"
#include "elist.h"
diff --git a/util.h b/util.h
index 2560552..3829c07 100644
--- a/util.h
+++ b/util.h
@@ -24,80 +24,7 @@
#define INVINETADDR INADDR_NONE
#define CLOSESOCKET closesocket
- static char WSAbuf[1024];
-
- struct WSAERRORS {
- int id;
- char *code;
- } WSAErrors[] = {
- { 0, "No error" },
- { WSAEINTR, "Interrupted system call" },
- { WSAEBADF, "Bad file number" },
- { WSAEACCES, "Permission denied" },
- { WSAEFAULT, "Bad address" },
- { WSAEINVAL, "Invalid argument" },
- { WSAEMFILE, "Too many open sockets" },
- { WSAEWOULDBLOCK, "Operation would block" },
- { WSAEINPROGRESS, "Operation now in progress" },
- { WSAEALREADY, "Operation already in progress" },
- { WSAENOTSOCK, "Socket operation on non-socket" },
- { WSAEDESTADDRREQ, "Destination address required" },
- { WSAEMSGSIZE, "Message too long" },
- { WSAEPROTOTYPE, "Protocol wrong type for socket" },
- { WSAENOPROTOOPT, "Bad protocol option" },
- { WSAEPROTONOSUPPORT, "Protocol not supported" },
- { WSAESOCKTNOSUPPORT, "Socket type not supported" },
- { WSAEOPNOTSUPP, "Operation not supported on socket" },
- { WSAEPFNOSUPPORT, "Protocol family not supported" },
- { WSAEAFNOSUPPORT, "Address family not supported" },
- { WSAEADDRINUSE, "Address already in use" },
- { WSAEADDRNOTAVAIL, "Can't assign requested address" },
- { WSAENETDOWN, "Network is down" },
- { WSAENETUNREACH, "Network is unreachable" },
- { WSAENETRESET, "Net connection reset" },
- { WSAECONNABORTED, "Software caused connection abort" },
- { WSAECONNRESET, "Connection reset by peer" },
- { WSAENOBUFS, "No buffer space available" },
- { WSAEISCONN, "Socket is already connected" },
- { WSAENOTCONN, "Socket is not connected" },
- { WSAESHUTDOWN, "Can't send after socket shutdown" },
- { WSAETOOMANYREFS, "Too many references, can't splice" },
- { WSAETIMEDOUT, "Connection timed out" },
- { WSAECONNREFUSED, "Connection refused" },
- { WSAELOOP, "Too many levels of symbolic links" },
- { WSAENAMETOOLONG, "File name too long" },
- { WSAEHOSTDOWN, "Host is down" },
- { WSAEHOSTUNREACH, "No route to host" },
- { WSAENOTEMPTY, "Directory not empty" },
- { WSAEPROCLIM, "Too many processes" },
- { WSAEUSERS, "Too many users" },
- { WSAEDQUOT, "Disc quota exceeded" },
- { WSAESTALE, "Stale NFS file handle" },
- { WSAEREMOTE, "Too many levels of remote in path" },
- { WSASYSNOTREADY, "Network system is unavailable" },
- { WSAVERNOTSUPPORTED, "Winsock version out of range" },
- { WSANOTINITIALISED, "WSAStartup not yet called" },
- { WSAEDISCON, "Graceful shutdown in progress" },
- { WSAHOST_NOT_FOUND, "Host not found" },
- { WSANO_DATA, "No host data of that type was found" },
- { -1, "Unknown error code" }
- };
-
- static char *WSAErrorMsg()
- {
- int i;
- int id = WSAGetLastError();
-
- /* Assume none of them are actually -1 */
- for (i = 0; WSAErrors[i].id != -1; i++)
- if (WSAErrors[i].id == id)
- break;
-
- sprintf(WSAbuf, "Socket Error: (%d) %s", id, WSAErrors[i].code);
-
- return &(WSAbuf[0]);
- }
-
+ extern char *WSAErrorMsg(void);
#define SOCKERRMSG WSAErrorMsg()
#ifndef SHUT_RDWR