Skip to content

Commit

Permalink
win32 build fix
Browse files Browse the repository at this point in the history
  • Loading branch information
obastemur committed Apr 1, 2015
1 parent e455962 commit 811d1aa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions deps/uv/src/win/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ int WSAAPI uv_wsarecvfrom_workaround(
WSAOVERLAPPED* overlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_routine);

int WSAAPI
uv_msafd_poll(SOCKET socket, AFD_POLL_INFO* info, OVERLAPPED* overlapped);
int WSAAPI uv_msafd_poll(SOCKET socket, AFD_POLL_INFO* info_in,
AFD_POLL_INFO* info_out, OVERLAPPED* overlapped);

/* Whether there are any non-IFS LSPs stacked on TCP */
extern int uv_tcp_non_ifs_lsp_ipv4;
Expand Down
9 changes: 5 additions & 4 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@ set noperfctr_msi_arg=
set engine_mozilla=
set static_library=
set compress_internals=
set c_platform=

:next-arg
if "%1"=="" goto args-done
if /i "%1"=="debug" set config=Debug&goto arg-ok
if /i "%1"=="release" set config=Release&goto arg-ok
if /i "%1"=="clean" set target=Clean&goto arg-ok
if /i "%1"=="ia32" set target_arch=ia32&goto arg-ok
if /i "%1"=="x86" set target_arch=ia32&goto arg-ok
if /i "%1"=="ia32" set c_platform="/p:Platform=Win32"&set target_arch=ia32&goto arg-ok
if /i "%1"=="x86" set c_platform="/p:Platform=Win32"&set target_arch=ia32&goto arg-ok
if /i "%1"=="x64" set target_arch=x64&goto arg-ok
if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok
if /i "%1"=="nobuild" set nobuild=1&goto arg-ok
Expand Down Expand Up @@ -136,8 +137,8 @@ goto run

:msbuild-found
@rem Build the sln with msbuild.
msbuild jx.sln /m /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
if errorlevel 1 goto exit
msbuild jx.sln /m /t:%target% /p:Configuration="%config%" %c_platform% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
goto exit

:sign
@rem Skip signing if the `nosign` option was specified.
Expand Down

0 comments on commit 811d1aa

Please sign in to comment.