Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some build issues with mingw #1680

Merged
merged 4 commits into from
Aug 20, 2021
Merged

Fix some build issues with mingw #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0884f50
contrib/curl: Import fix for pollfd structure conflict
Biswa96 Jul 29, 2021
cb43457
host: Fix some warnings with mingw gcc
Biswa96 Jul 29, 2021
afa0aca
Merge branch 'master' into fix-mingw
nickclark2016 Aug 3, 2021
ae86c99
Merge branch 'master' into fix-mingw
nickclark2016 Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contrib/curl/lib/select.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@

#if !defined(HAVE_STRUCT_POLLFD) && \
!defined(HAVE_SYS_POLL_H) && \
!defined(HAVE_POLL_H)
!defined(HAVE_POLL_H) && \
!defined(POLLIN)
nickclark2016 marked this conversation as resolved.
Show resolved Hide resolved

#define POLLIN 0x01
#define POLLPRI 0x02
Expand Down
2 changes: 2 additions & 0 deletions src/host/os_getversion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ int os_getversion(lua_State* L)

#if defined(PLATFORM_WINDOWS)

#ifdef _MSC_VER
nickclark2016 marked this conversation as resolved.
Show resolved Hide resolved
#pragma comment(lib, "version.lib")
#endif

int getKernelVersion(struct OsVersionInfo* info)
{
Expand Down
4 changes: 2 additions & 2 deletions src/host/os_isdir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
#include "premake.h"

#ifdef _WIN32
#include <Windows.h>
#include <windows.h>
nickclark2016 marked this conversation as resolved.
Show resolved Hide resolved
#endif

int os_isdir(lua_State* L)
{
struct stat buf;
const char* path = luaL_checkstring(L, 1);
#ifdef _WIN32
int attr;
DWORD attr;
nickclark2016 marked this conversation as resolved.
Show resolved Hide resolved

wchar_t wide_path[PATH_MAX];
if (MultiByteToWideChar(CP_UTF8, 0, path, -1, wide_path, PATH_MAX) == 0)
Expand Down
2 changes: 1 addition & 1 deletion src/host/os_uuid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "premake.h"

#if PLATFORM_WINDOWS
#include <Objbase.h>
#include <objbase.h>
nickclark2016 marked this conversation as resolved.
Show resolved Hide resolved
#endif


Expand Down