Skip to content

Commit 25d9e96

Browse files
Merge branch 'pgmspace_to_libc' into exceptions
Bring newlib changes into the tree from original PR esp8266#4160
2 parents dc75c8b + aa8621b commit 25d9e96

File tree

24 files changed

+1937
-460
lines changed

24 files changed

+1937
-460
lines changed

cores/esp8266/Arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ const int TIM_DIV265 __attribute__((deprecated, weak)) = TIM_DIV256;
253253
#ifdef __cplusplus
254254

255255
#include <algorithm>
256-
#include "pgmspace.h"
256+
#include <pgmspace.h>
257257

258258
#include "WCharacter.h"
259259
#include "WString.h"

cores/esp8266/libc_replacements.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ void _exit(int status) {
128128
int atexit(void (*func)()) {
129129
(void) func;
130130
return 0;
131-
}
131+
}

cores/esp8266/pgmspace.cpp

-292
This file was deleted.

0 commit comments

Comments
 (0)