summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-03-28 19:34:50 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-03-29 00:49:06 +0100
commit6450cbbdca62fe5fa9e58b835b29b35bf4079286 (patch)
treec1f2a6185faf2a4f761c3af8575e46a744885306
parent022dfe7ab3ae17987763a1838e274dd7be4482d6 (diff)
downloadrockbox-6450cbbdca.tar.gz
rockbox-6450cbbdca.tar.bz2
rockbox-6450cbbdca.zip
headers: Don't blindly include <inttypes.h> in files used by ASM
Causes things to go boom with newer toolchains. Change-Id: Ibd00edc9ea16aae8115b63ebce08ac920b0608a2
-rw-r--r--firmware/export/pl080.h1
-rw-r--r--firmware/export/s5l8700.h4
-rw-r--r--firmware/export/s5l8702.h4
3 files changed, 7 insertions, 2 deletions
diff --git a/firmware/export/pl080.h b/firmware/export/pl080.h
index 9e48f07f0c..fe0013b59d 100644
--- a/firmware/export/pl080.h
+++ b/firmware/export/pl080.h
@@ -24,6 +24,7 @@
/*
* ARM PrimeCell PL080 Multiple Master DMA controller
*/
+#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
diff --git a/firmware/export/s5l8700.h b/firmware/export/s5l8700.h
index b559992c6a..945cf932cd 100644
--- a/firmware/export/s5l8700.h
+++ b/firmware/export/s5l8700.h
@@ -19,7 +19,9 @@
*
****************************************************************************/
-#include <inttypes.h>
+#ifndef ASM
+#include <stdint.h>
+#endif
#define REG8_PTR_T volatile uint8_t *
#define REG16_PTR_T volatile uint16_t *
diff --git a/firmware/export/s5l8702.h b/firmware/export/s5l8702.h
index f9bf99ed3b..4b22e25366 100644
--- a/firmware/export/s5l8702.h
+++ b/firmware/export/s5l8702.h
@@ -22,7 +22,9 @@
#ifndef __S5L8702_H__
#define __S5L8702_H__
-#include <inttypes.h>
+#ifndef ASM
+#include <stdint.h>
+#endif
#define REG8_PTR_T volatile uint8_t *
#define REG16_PTR_T volatile uint16_t *