Skip to content

Commit 2b73ea7

Browse files
committed
Compile modified pgmspace.h before avr-libc one
1 parent 7afadb3 commit 2b73ea7

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Diff for: bootloaders/boot.c

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
*/
3737
#define F_CPU_RESET (16E6/6)
3838

39+
#include "api/deprecated-avr-comp/avr/pgmspace.h"
3940
#include <avr/io.h>
4041
#include <assert.h>
4142
#include <stdbool.h>

Diff for: cores/arduino/Arduino.h

+8-4
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@
2020
#ifndef Arduino_h
2121
#define Arduino_h
2222

23-
#include "api/ArduinoAPI.h"
23+
#ifdef __PGMSPACE_H_
24+
#undef __PGMSPACE_H_
25+
#endif
2426

25-
#include <avr/pgmspace.h>
27+
#include "api/deprecated-avr-comp/avr/pgmspace.h"
2628
#include <avr/io.h>
2729
#include <avr/interrupt.h>
28-
30+
31+
#include "api/ArduinoAPI.h"
32+
/*
2933
#undef F
3034
#define F(str) (str)
31-
35+
*/
3236
#ifdef __cplusplus
3337
extern "C"{
3438
#endif

0 commit comments

Comments
 (0)