additional mingw fixes

Signed-off-by: martell <martellmalone@gmail.com>
This commit is contained in:
martell 2014-02-15 13:37:08 +08:00 committed by Andy Green
parent 19c73f3bed
commit e91a759b8a
2 changed files with 33 additions and 29 deletions

View file

@ -1,28 +1,31 @@
#ifndef _GET_TIME_OF_DAY_H
#define _GET_TIME_OF_DAY_H
#ifdef __MINGW64__
#else
#ifdef __MINGW32__
#else
#include < time.h >
#endif
#endif
#include <windows.h> //I've ommited context line.
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
#else
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
#endif
struct timezone
{
int tz_minuteswest; /* minutes W of Greenwich */
int tz_dsttime; /* type of dst correction */
};
int gettimeofday(struct timeval *tv, struct timezone *tz);
#endif
#ifndef _GET_TIME_OF_DAY_H
#define _GET_TIME_OF_DAY_H
#ifdef __MINGW64__
#else
#ifdef __MINGW32__
#else
#include < time.h >
#endif
#endif
#include <windows.h> //I've ommited context line.
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
#else
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
#endif
#ifndef _TIMEZONE_DEFINED
struct timezone
{
int tz_minuteswest; /* minutes W of Greenwich */
int tz_dsttime; /* type of dst correction */
};
int gettimeofday(struct timeval *tv, struct timezone *tz);
#endif
#endif

View file

@ -51,8 +51,9 @@ typedef struct pollfd {
typedef INT (WSAAPI *PFNWSAPOLL)(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
extern PFNWSAPOLL poll;
#ifndef __MINGW32__
extern INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
#endif
/* override configure because we are not using Makefiles */
#define LWS_NO_FORK