Skip to content

Commit 129175c

Browse files
committed
add prototypes for ets_vsnprintf and ets_vprintf
fix some compiler warnings
1 parent af6c400 commit 129175c

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
#ifndef __PGMSPACE_H_
22
#define __PGMSPACE_H_
33

4+
#ifdef __cplusplus
5+
extern "C" {
6+
#endif
47
#include <stdint.h>
8+
#include <stdio.h>
9+
#include "ets_sys.h"
10+
#include "osapi.h"
11+
#ifdef __cplusplus
12+
}
13+
#endif
514

615
#define PROGMEM
716
#define PGM_P const char *
817
#define PSTR(str) (str)
918

10-
#define vsnprintf_P(...) vsnprintf( __VA_ARGS__ )
19+
#define vsnprintf_P(...) ets_vsnprintf( __VA_ARGS__ )
1120
#define snprintf_P(...) snprintf( __VA_ARGS__ )
21+
#define printf_P(...) os_printf(__VA_ARGS__)
1222

1323
#define _SFR_BYTE(n) (n)
1424

hardware/tools/esp8266/sdk/include/c_types.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#define _C_TYPES_H_
88
#include <stdint.h>
99
#include <stdbool.h>
10+
#include <stdarg.h>
1011

1112
typedef signed char sint8_t;
1213
typedef signed short sint16_t;
@@ -75,8 +76,8 @@ typedef enum {
7576
#ifndef __cplusplus
7677
//typedef unsigned char bool;
7778
#define BOOL bool
78-
#define true (1)
79-
#define false (0)
79+
//#define true (1)
80+
//#define false (0)
8081
#define TRUE true
8182
#define FALSE false
8283

hardware/tools/esp8266/sdk/include/ets_sys.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ void ets_isr_unmask(int intr);
118118
void ets_isr_attach(int intr, int_handler_t handler, void *arg);
119119
void ets_intr_lock();
120120
void ets_intr_unlock();
121-
121+
int ets_vsnprintf(char * s, size_t n, const char * format, va_list arg);
122+
int ets_vprintf(const char * format, va_list arg);
122123

123124
#endif /* _ETS_SYS_H */

0 commit comments

Comments
 (0)