Skip to content

Commit f54da2d

Browse files
authored
Merge pull request #297 from deeglaze/minor_compilation_fixes
Minor fixes for compilation errors Signed-off-by: Zhang Lili Z <[email protected]>
2 parents 5234aa7 + fb5a866 commit f54da2d

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

sdk/sign_tool/SignTool/elf_helper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static void dump_textrel(const uint64_t& offset)
4444
using namespace std;
4545

4646
cerr << "warning: TEXTRELs found at offset: "
47-
<< hex << showbase /* show the '0x' prefix */
47+
<< std::hex << showbase /* show the '0x' prefix */
4848
<< offset << endl;
4949
}
5050

sdk/sign_tool/SignTool/manage_metadata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ bool CMetadata::get_time(uint32_t *date)
229229
uint32_t tmp_date = (timeinfo->tm_year+1900)*10000 + (timeinfo->tm_mon+1)*100 + timeinfo->tm_mday;
230230
stringstream ss;
231231
ss<<"0x"<<tmp_date;
232-
ss>>hex>>tmp_date;
232+
ss>>std::hex>>tmp_date;
233233
*date = tmp_date;
234234
return true;
235235
}

sdk/simulation/uae_service_sim/linux/platform_service_sim.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
#include <sys/types.h>
3838
#include <stdlib.h>
3939
#include <pwd.h>
40+
#ifndef __STDC_FORMAT_MACROS
4041
#define __STDC_FORMAT_MACROS
42+
#endif
4143
#include <inttypes.h>
4244

4345
static Mutex g_pse_sim_lock;

sdk/tlibc/gen/spinlock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
static inline void _mm_pause(void) __attribute__((always_inline));
3535
static inline int _InterlockedExchange(int volatile * dst, int val) __attribute__((always_inline));
3636

37-
static inline void _mm_pause(void)
37+
static inline void _mm_pause(void) /* definition requires -ffreestanding */
3838
{
3939
__asm __volatile(
4040
"pause"

0 commit comments

Comments
 (0)