Fix build on 32-bit x86

thiagomacieira · thiagomacieira · commit 2f5d20ebecbc · 2017-03-30T17:56:07.000-07:00
We need the regparm decoration in the definition, not just the
declaration.

Signed-off-by: Thiago Macieira &lt;thiago.macieira@intel.com&gt;
diff --git a/src/cborparser.c b/src/cborparser.c
@@ -163,7 +163,7 @@ static inline uint64_t get64(const uint8_t *ptr)
     return cbor_ntohll(result);
 }
 
-CborError _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len)
+CBOR_INTERNAL_API_CC CborError _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len)
 {
     uint8_t additional_information = **ptr & SmallValueMask;
     ++*ptr;
diff --git a/src/compilersupport_p.h b/src/compilersupport_p.h
@@ -84,7 +84,7 @@
 #endif
 #define DBL_DECIMAL_DIG_STR     STRINGIFY(DBL_DECIMAL_DIG)
 
-#if defined(__GNUC__) && defined(__i386__)
+#if defined(__GNUC__) && defined(__i386__) && !defined(__iamcu__)
 #  define CBOR_INTERNAL_API_CC          __attribute__((regparm(3)))
 #elif defined(_MSC_VER) && defined(_M_IX86)
 #  define CBOR_INTERNAL_API_CC          __fastcall

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ static inline uint64_t get64(const uint8_t *ptr)`
`163`	`163`	`return cbor_ntohll(result);`
`164`	`164`	`}`
`165`	`165`
`166`		`-CborError _cbor_value_extract_number(const uint8_t *ptr, const uint8_t end, uint64_t *len)`
	`166`	`+CBOR_INTERNAL_API_CC CborError _cbor_value_extract_number(const uint8_t *ptr, const uint8_t end, uint64_t *len)`
`167`	`167`	`{`
`168`	`168`	`uint8_t additional_information = **ptr & SmallValueMask;`
`169`	`169`	`++*ptr;`