diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2017-11-07 16:48:07 -0500 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2017-11-07 16:48:07 -0500 |
commit | 63eae4339a865935b02c8025136f9a9bed83c0b0 (patch) | |
tree | b24f394b256c8583540951933b41d5a8ccbba3a2 | |
parent | 826f99e18701988d7e7cdc3d7019a20e1d697403 (diff) | |
download | rockbox-63eae4339a865935b02c8025136f9a9bed83c0b0.tar.gz rockbox-63eae4339a865935b02c8025136f9a9bed83c0b0.zip |
rolo.c: Change 'int errno' to 'int err'
It can cause issues if errno.h finds itself included there
Change-Id: Id5d2be66cd3af4c2760e4a37d3332853e9b54f95
-rw-r--r-- | firmware/rolo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/rolo.c b/firmware/rolo.c index d432642d9d..1d164b4668 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c | |||
@@ -218,7 +218,7 @@ int rolo_load(const char* filename) | |||
218 | unsigned char* ramstart = (void*)&loadaddress; | 218 | unsigned char* ramstart = (void*)&loadaddress; |
219 | unsigned char* filebuf; | 219 | unsigned char* filebuf; |
220 | size_t filebuf_size; | 220 | size_t filebuf_size; |
221 | int errno, length; | 221 | int err, length; |
222 | 222 | ||
223 | lcd_clear_display(); | 223 | lcd_clear_display(); |
224 | lcd_puts(0, 0, "ROLO..."); | 224 | lcd_puts(0, 0, "ROLO..."); |
@@ -238,15 +238,15 @@ int rolo_load(const char* filename) | |||
238 | rolo_handle = core_alloc_maximum("rolo", &filebuf_size, NULL); | 238 | rolo_handle = core_alloc_maximum("rolo", &filebuf_size, NULL); |
239 | filebuf = core_get_data(rolo_handle); | 239 | filebuf = core_get_data(rolo_handle); |
240 | 240 | ||
241 | errno = LOAD_FIRMWARE(filebuf, filename, filebuf_size); | 241 | err = LOAD_FIRMWARE(filebuf, filename, filebuf_size); |
242 | 242 | ||
243 | if (errno <= 0) | 243 | if (err <= 0) |
244 | { | 244 | { |
245 | rolo_error(loader_strerror(errno)); | 245 | rolo_error(loader_strerror(err)); |
246 | return -1; | 246 | return -1; |
247 | } | 247 | } |
248 | else | 248 | else |
249 | length = errno; | 249 | length = err; |
250 | 250 | ||
251 | #if defined(CPU_PP) && NUM_CORES > 1 | 251 | #if defined(CPU_PP) && NUM_CORES > 1 |
252 | lcd_puts(0, 2, "Waiting for coprocessor..."); | 252 | lcd_puts(0, 2, "Waiting for coprocessor..."); |