admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Port to MinGW

Browse Source 
Compile-tested only.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2021-05-23 12:13:59 -07:00
parent ca9c585ef6
commit 70759869ff
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
win32/win32_compat.c
View File

@@ -21,11 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#ifndef _WIN32
static int dummy ATTRIBUTE((unused));
#else
#include "win32_compat.h"
#include <errno.h>
#include <stdio.h>
@@ -209,5 +204,3 @@ int win32_dup2(int oldfd, int newfd)
{
return 0;
}
#endif

18
win32/win32_compat.h
View File

@@ -30,7 +30,7 @@ THE SOFTWARE.
#include <winsock2.h>
#include <ws2tcpip.h>
#include <Ws2ipdef.h>
#include <ws2ipdef.h>
#include <basetsd.h>
#include <io.h>
#include <malloc.h>
@@ -58,10 +58,12 @@ struct pollfd {
};
#endif
#ifdef _MSC_VER
typedef int ssize_t;
typedef int uid_t;
typedef int gid_t;
typedef int socklen_t;
#endif
/* Wrapper macros to call misc. functions win32 is missing */
#define close closesocket
@@ -74,12 +76,21 @@ typedef int socklen_t;
#define poll(x, y, z) win32_poll(x, y, z)
#define inet_pton(x,y,z) win32_inet_pton(x,y,z)
#define sleep(x) Sleep(x * 1000)
#ifdef _MSC_VER
#define getpid GetCurrentProcessId
#endif
#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf(a, b, c, ...) _snprintf_s(a, b, b, c, ## __VA_ARGS__)
#endif
struct timezone;
struct iovec {
void *iov_base;
size_t iov_len;
};
int win32_inet_pton(int af, const char * src, void * dst);
int win32_poll(struct pollfd *fds, unsigned int nfsd, int timeout);
int win32_gettimeofday(struct timeval *tv, struct timezone *tz);
@@ -87,11 +98,6 @@ ssize_t win32_writev(int fd, const struct iovec *iov, int iovcnt);
ssize_t win32_readv(int fd, const struct iovec *iov, int iovcnt);
int win32_dup2(int oldfd, int newfd);
struct iovec {
void *iov_base;
size_t iov_len;
};
#define inline
#endif // _WIN32