From 63eae4339a865935b02c8025136f9a9bed83c0b0 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Tue, 7 Nov 2017 16:48:07 -0500 Subject: [PATCH] rolo.c: Change 'int errno' to 'int err' It can cause issues if errno.h finds itself included there Change-Id: Id5d2be66cd3af4c2760e4a37d3332853e9b54f95 --- firmware/rolo.c | 10 +++++----- 1 file 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) unsigned char* ramstart = (void*)&loadaddress; unsigned char* filebuf; size_t filebuf_size; - int errno, length; + int err, length; lcd_clear_display(); lcd_puts(0, 0, "ROLO..."); @@ -238,15 +238,15 @@ int rolo_load(const char* filename) rolo_handle = core_alloc_maximum("rolo", &filebuf_size, NULL); filebuf = core_get_data(rolo_handle); - errno = LOAD_FIRMWARE(filebuf, filename, filebuf_size); + err = LOAD_FIRMWARE(filebuf, filename, filebuf_size); - if (errno <= 0) + if (err <= 0) { - rolo_error(loader_strerror(errno)); + rolo_error(loader_strerror(err)); return -1; } else - length = errno; + length = err; #if defined(CPU_PP) && NUM_CORES > 1 lcd_puts(0, 2, "Waiting for coprocessor...");