From 2bc59544ed82256e838c1be5008e3bffef885e05 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 28 Feb 2021 06:16:17 +0100 Subject: [PATCH] Rename ar7030p_utils.c PAGE_SIZE to 7030_PAGE_SIZE to avoid conflict with Android build --- rigs/aor/ar7030p_utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rigs/aor/ar7030p_utils.c b/rigs/aor/ar7030p_utils.c index aafce3c55..b3dcd1d0d 100644 --- a/rigs/aor/ar7030p_utils.c +++ b/rigs/aor/ar7030p_utils.c @@ -36,7 +36,7 @@ static enum PAGE_e curPage = NONE; /* Current memory page */ static unsigned int curAddr = 65535; /* Current page address */ static enum LOCK_LVL_e curLock = LOCK_0; /* Current lock level */ -static const unsigned int PAGE_SIZE[] = +static const unsigned int 7030_PAGE_SIZE[] = { 256, 256, 512, 4096, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -435,7 +435,7 @@ static int setAddr(RIG *rig, enum PAGE_e page, unsigned int addr) if ((EEPROM3 >= page) || (ROM == page)) { - if (PAGE_SIZE[page] > addr) + if (7030_PAGE_SIZE[page] > addr) { if (curPage != page) { @@ -1454,11 +1454,11 @@ int pageSize(const enum PAGE_e page) if ((WORKING <= page) && (EEPROM3 >= page)) { - rc = (int) PAGE_SIZE[ page ]; + rc = (int) 7030_PAGE_SIZE[ page ]; } else if (ROM == page) { - rc = (int) PAGE_SIZE[ page ]; + rc = (int) 7030_PAGE_SIZE[ page ]; } else {