From af2d38bed940dcfa002276efb1e3582dc0ac6c2f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 5 Oct 2019 03:32:53 +0200
Subject: [PATCH] Revert back Armadillo to 9.800.x

---
 CMakeLists.txt                            |  2 +-
 src/core/libs/supl/asn-supl/ber_decoder.c | 24 +++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e464cc62a..1fe4f0cec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -401,7 +401,7 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0")
 ################################################################################
 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
 set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0")
-set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.100.x")
+set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.800.x")
 set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0")
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
 set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")
diff --git a/src/core/libs/supl/asn-supl/ber_decoder.c b/src/core/libs/supl/asn-supl/ber_decoder.c
index e7928583c..89c1475e8 100644
--- a/src/core/libs/supl/asn-supl/ber_decoder.c
+++ b/src/core/libs/supl/asn-supl/ber_decoder.c
@@ -6,21 +6,21 @@
 
 #undef    ADVANCE
 #define    ADVANCE(num_bytes)    do {                    \
-        size_t num = num_bytes;                    \
-        ptr = ((const char *)ptr) + num;            \
-        size -= num;                        \
-        consumed_myself += num;                    \
+        size_t num = num_bytes;                          \
+        ptr = ((const char *)ptr) + num;                 \
+        size -= num;                                     \
+        consumed_myself += num;                          \
     } while(0)
 #undef    RETURN
-#define    RETURN(_code)    do {                        \
-        asn_dec_rval_t rval;                    \
-        rval.code = _code;                    \
+#define    RETURN(_code)    do {                         \
+        asn_dec_rval_t rval;                             \
+        rval.code = _code;                               \
         if(opt_ctx) opt_ctx->step = step; /* Save context */    \
-        if((_code) == RC_OK || opt_ctx)                \
-            rval.consumed = consumed_myself;        \
-        else                            \
-            rval.consumed = 0;    /* Context-free */    \
-        return rval;                        \
+        if((_code) == RC_OK || opt_ctx)                  \
+            rval.consumed = consumed_myself;             \
+        else                                             \
+            rval.consumed = 0;    /* Context-free */     \
+        return rval;                                     \
     } while(0)
 
 /*