From d46d607334c97b101b9b7d66fad3fbe8fa8b9fa1 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Wed, 7 Oct 2020 11:32:50 +0300
Subject: [PATCH] backporting: remove C typedef redefinitions of
 map_int/map_string/array_byte/array_string

---
 vlib/strconv/atoi.v   | 2 --
 vlib/v/gen/cheaders.v | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/vlib/strconv/atoi.v b/vlib/strconv/atoi.v
index c002ba6569..b20d5c2383 100644
--- a/vlib/strconv/atoi.v
+++ b/vlib/strconv/atoi.v
@@ -84,7 +84,6 @@ pub fn common_parse_uint2(s string, _base int, _bit_size int) (u64, int) {
 	// Use compile-time constants for common cases.
 	cutoff := max_u64 / u64(base) + u64(1)
 	max_val := if bit_size == 64 { max_u64 } else { (u64(1)<<u64(bit_size)) - u64(1) }
-	mut underscores := false
 	mut n := u64(0)
 	for i in start_index .. s.len {
 		c := s[i]
@@ -92,7 +91,6 @@ pub fn common_parse_uint2(s string, _base int, _bit_size int) (u64, int) {
 		mut d := byte(0)
 		if c == `_` && base0 {
 			// underscore_ok already called
-			underscores = true
 			continue
 		}
 		else if `0` <= c && c <= `9` {
diff --git a/vlib/v/gen/cheaders.v b/vlib/v/gen/cheaders.v
index 306232a869..135519fc52 100644
--- a/vlib/v/gen/cheaders.v
+++ b/vlib/v/gen/cheaders.v
@@ -433,16 +433,16 @@ typedef void* voidptr;
 typedef char* charptr;
 typedef struct array array;
 typedef struct map map;
-typedef array array_string;
 typedef array array_int;
-typedef array array_byte;
 typedef array array_f32;
 typedef array array_f64;
 typedef array array_u16;
 typedef array array_u32;
 typedef array array_u64;
-typedef map map_int;
-typedef map map_string;
+//typedef map map_int;
+//typedef map map_string;
+//typedef array array_string;
+//typedef array array_byte;
 typedef byte array_fixed_byte_300 [300];
 typedef byte array_fixed_byte_400 [400];