boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-13 12:22:17 +00:00
Code Issues Projects Releases Wiki Activity

More Windows build warning removal.

Browse Source
This commit is contained in:
Rene Rivera
2020-02-26 16:25:43 -06:00
parent 520ebfd0bf
commit 4077c4fe41
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/debugger.cpp
View File

@@ -1109,12 +1109,12 @@ static void debug_start_child( int argc, const char * * argv )
assert( debug_state == DEBUG_NO_CHILD );
if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) )
{
printf("internal error: CreatePipe:1: 0x%08x\n", GetLastError());
printf("internal error: CreatePipe:1: 0x%08lx\n", GetLastError());
return;
}
if ( ! CreatePipe( &pipe2[ 0 ], &pipe2[ 1 ], &sa, 0 ) )
{
printf("internal error: CreatePipe:2: 0x%08x\n", GetLastError());
printf("internal error: CreatePipe:2: 0x%08lx\n", GetLastError());
CloseHandle( pipe1[ 0 ] );
CloseHandle( pipe1[ 1 ] );
return;

13
src/engine/execnt.cpp
View File

@@ -55,6 +55,7 @@
#include <windows.h>
#include <process.h>
#include <tlhelp32.h>
#include <versionhelpers.h>
/* get the maximum shell command line length according to the OS */
@@ -568,12 +569,8 @@ static void invoke_cmd( char const * const command, int const slot )
static int raw_maxline()
{
OSVERSIONINFO os_info;
os_info.dwOSVersionInfoSize = sizeof( os_info );
GetVersionEx( &os_info );
if ( os_info.dwMajorVersion >= 5 ) return 8191; /* XP */
if ( os_info.dwMajorVersion == 4 ) return 2047; /* NT 4.x */
if ( IsWindowsVersionOrGreater(5,0,0) ) return 8191; /* XP */
if ( IsWindowsVersionOrGreater(4,0,0) ) return 2047; /* NT 4.x */
return 996; /* NT 3.5.1 */
}
@@ -1201,7 +1198,7 @@ static FILE * open_command_file( int const slot )
string_new( command_file );
string_reserve( command_file, tmpdir->size + 64 );
command_file->size = sprintf( command_file->value,
"%s\\jam%ul-%02d-##.bat", tmpdir->value, procID, slot );
"%s\\jam%lu-%02d-##.bat", tmpdir->value, procID, slot );
}
/* For some reason opening a command file can fail intermittently. But doing
@@ -1322,7 +1319,7 @@ static void reportWindowsError( char const * const apiName, int slot )
err_buf = cmdtab[ slot ].buffer_out;
string_append( err_buf, apiName );
string_append( err_buf, "() Windows API failed: " );
sprintf( buf, "%ul", errorCode );
sprintf( buf, "%lu", errorCode );
string_append( err_buf, buf );
if ( !apiResult )

5
src/engine/timestamp.cpp
View File

@@ -96,9 +96,10 @@ void timestamp_clear( timestamp * const time )
int timestamp_cmp( timestamp const * const lhs, timestamp const * const rhs )
{
return lhs->secs == rhs->secs
return int(
lhs->secs == rhs->secs
? lhs->nsecs - rhs->nsecs
: lhs->secs - rhs->secs;
: lhs->secs - rhs->secs );
}