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

MinGW: Second step of porting to MinGW

Browse Source
This commit is contained in:
Bart Van Assche
2021-07-17 21:22:26 -07:00
parent 16f817bfba
commit 5e6f6ec5ed
16 changed files with 98 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
win32/win32_compat.c
View File

@@ -21,10 +21,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "config.h"
#include "win32_compat.h"
#include <errno.h>
#include <stdio.h>
#include < time.h >
#include <time.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#undef poll
#undef socket
@@ -46,15 +50,13 @@ int win32_inet_pton(int af, const char *src, void *dst)
struct sockaddr_in sa;
int len = sizeof(SOCKADDR);
int ret = -1;
int strLen = strlen(src) + 1;
#ifdef UNICODE
int strLen = strlen(src) + 1;
wchar_t *srcNonConst = (wchar_t *)malloc(strLen * sizeof(wchar_t));
memset(srcNonConst, 0, strLen);
MultiByteToWideChar(CP_ACP, 0, src, -1, srcNonConst, strLen);
#else
char *srcNonConst = (char *)malloc(strLen);
memset(srcNonConst, 0, strLen);
strncpy(srcNonConst, src, strLen);
char *srcNonConst = strdup(src);
#endif
if (WSAStringToAddress(srcNonConst, af, NULL, (LPSOCKADDR)&sa, &len) ==
@@ -72,7 +74,7 @@ int win32_inet_pton(int af, const char *src, void *dst)
int win32_poll(struct pollfd *fds, unsigned int nfds, int timo)
{
struct timeval timeout, *toptr;
SELECT_TIMEVAL_TYPE timeout, *toptr;
fd_set ifds, ofds, efds, *ip, *op;
unsigned int i;
int rc;
@@ -142,10 +144,12 @@ int win32_poll(struct pollfd *fds, unsigned int nfds, int timo)
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
#endif
#ifndef HAVE_TIMEZONE_TZ_DSTTIME
struct timezone {
int tz_minuteswest; /* minutes W of Greenwich */
int tz_dsttime; /* type of dst correction */
};
#endif
int win32_gettimeofday(struct timeval *tv, struct timezone *tz)
{
@@ -169,7 +173,11 @@ int win32_gettimeofday(struct timeval *tv, struct timezone *tz)
if (NULL != tz) {
if (!tzflag) {
#ifdef HAVE_TZSET
tzset();
#else
_tzset();
#endif
tzflag++;
}
tz->tz_minuteswest = _timezone / 60;

6
win32/win32_compat.h
View File

@@ -25,9 +25,6 @@ THE SOFTWARE.
#ifndef win32_COMPAT_H_
#define win32_COMPAT_H_
#ifdef _WIN32
#define NO_IPv6 1
#include <winsock2.h>
#include <ws2tcpip.h>
#include <ws2ipdef.h>
@@ -98,7 +95,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);
#define inline
#define inline __inline__
#endif // _WIN32
#endif // win32_COMPAT_H_