Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
74d27b34
Commit
74d27b34
authored
Jan 28, 2016
by
Johny Mattsson
Browse files
Merge pull request #968 from devsaurus/crypto_http_mqtt_lua-gnu11
Enable -std=gnu11 for crypto, http, mqtt, and lua dir
parents
5ec2b695
f149b60c
Changes
11
Hide whitespace changes
Inline
Side-by-side
app/crypto/Makefile
View file @
74d27b34
...
@@ -15,6 +15,8 @@ ifndef PDIR
...
@@ -15,6 +15,8 @@ ifndef PDIR
GEN_LIBS
=
libcrypto.a
GEN_LIBS
=
libcrypto.a
endif
endif
STD_CFLAGS
=
-std
=
gnu11
-Wimplicit
#############################################################
#############################################################
# Configuration i.e. compile options etc.
# Configuration i.e. compile options etc.
# Target specific stuff (defines etc.) goes in here!
# Target specific stuff (defines etc.) goes in here!
...
...
app/http/Makefile
View file @
74d27b34
...
@@ -15,6 +15,7 @@ ifndef PDIR
...
@@ -15,6 +15,7 @@ ifndef PDIR
GEN_LIBS
=
libhttp.a
GEN_LIBS
=
libhttp.a
endif
endif
STD_CFLAGS
=
-std
=
gnu11
-Wimplicit
#############################################################
#############################################################
# Configuration i.e. compile options etc.
# Configuration i.e. compile options etc.
...
...
app/include/driver/readline.h
0 → 100644
View file @
74d27b34
#ifndef READLINE_APP_H
#define READLINE_APP_H
bool
uart_getc
(
char
*
c
);
#endif
/* READLINE_APP_H */
app/include/rom.h
View file @
74d27b34
...
@@ -122,6 +122,8 @@ char *ets_strcpy (char *dst, const char *src);
...
@@ -122,6 +122,8 @@ char *ets_strcpy (char *dst, const char *src);
size_t
ets_strlen
(
const
char
*
s
);
size_t
ets_strlen
(
const
char
*
s
);
int
ets_strcmp
(
const
char
*
s1
,
const
char
*
s2
);
int
ets_strcmp
(
const
char
*
s1
,
const
char
*
s2
);
int
ets_strncmp
(
const
char
*
s1
,
const
char
*
s2
,
size_t
n
);
int
ets_strncmp
(
const
char
*
s1
,
const
char
*
s2
,
size_t
n
);
char
*
ets_strncpy
(
char
*
dest
,
const
char
*
src
,
size_t
n
);
char
*
ets_strstr
(
const
char
*
haystack
,
const
char
*
needle
);
void
ets_delay_us
(
uint32_t
us
);
void
ets_delay_us
(
uint32_t
us
);
...
@@ -141,6 +143,10 @@ void ets_intr_lock(void);
...
@@ -141,6 +143,10 @@ void ets_intr_lock(void);
void
ets_intr_unlock
(
void
);
void
ets_intr_unlock
(
void
);
void
ets_install_putc1
(
void
*
routine
);
void
ets_install_putc1
(
void
*
routine
);
int
rand
(
void
);
void
srand
(
unsigned
int
);
void
uart_div_modify
(
int
no
,
unsigned
int
freq
);
void
uart_div_modify
(
int
no
,
unsigned
int
freq
);
#endif
#endif
app/libc/c_stdlib.h
View file @
74d27b34
...
@@ -10,6 +10,8 @@
...
@@ -10,6 +10,8 @@
#include "c_stddef.h"
#include "c_stddef.h"
#include "mem.h"
#include "mem.h"
#include <stdlib.h>
#define EXIT_FAILURE 1
#define EXIT_FAILURE 1
#define EXIT_SUCCESS 0
#define EXIT_SUCCESS 0
...
...
app/lua/Makefile
View file @
74d27b34
...
@@ -15,6 +15,8 @@ ifndef PDIR
...
@@ -15,6 +15,8 @@ ifndef PDIR
GEN_LIBS
=
liblua.a
GEN_LIBS
=
liblua.a
endif
endif
STD_CFLAGS
=
-std
=
gnu11
-Wimplicit
#############################################################
#############################################################
# Configuration i.e. compile options etc.
# Configuration i.e. compile options etc.
# Target specific stuff (defines etc.) goes in here!
# Target specific stuff (defines etc.) goes in here!
...
...
app/lua/lua.c
View file @
74d27b34
...
@@ -11,6 +11,8 @@
...
@@ -11,6 +11,8 @@
#include "c_string.h"
#include "c_string.h"
#include "flash_fs.h"
#include "flash_fs.h"
#include "user_version.h"
#include "user_version.h"
#include "driver/readline.h"
#include "driver/uart.h"
#define lua_c
#define lua_c
...
...
app/lua/lua.h
View file @
74d27b34
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
#include "c_stdarg.h"
#include "c_stdarg.h"
#include "c_stddef.h"
#include "c_stddef.h"
#include "c_types.h"
#include "c_types.h"
#include <ctype.h>
#endif
#endif
#include "luaconf.h"
#include "luaconf.h"
...
...
app/lua/luaconf.h
View file @
74d27b34
...
@@ -632,7 +632,7 @@ extern int readline4lua(const char *prompt, char *buffer, int length);
...
@@ -632,7 +632,7 @@ extern int readline4lua(const char *prompt, char *buffer, int length);
/*
/*
@@ The luai_num* macros define the primitive operations over numbers.
@@ The luai_num* macros define the primitive operations over numbers.
*/
*/
#if defined(LUA_CORE)
#if defined(LUA_CORE)
|| defined(LUA_LIB)
#ifdef LUA_CROSS_COMPILER
#ifdef LUA_CROSS_COMPILER
#include <math.h>
#include <math.h>
#else
#else
...
...
app/mqtt/Makefile
View file @
74d27b34
...
@@ -15,6 +15,8 @@ ifndef PDIR
...
@@ -15,6 +15,8 @@ ifndef PDIR
GEN_LIBS
=
mqtt.a
GEN_LIBS
=
mqtt.a
endif
endif
STD_CFLAGS
=
-std
=
gnu11
-Wimplicit
#############################################################
#############################################################
# Configuration i.e. compile options etc.
# Configuration i.e. compile options etc.
# Target specific stuff (defines etc.) goes in here!
# Target specific stuff (defines etc.) goes in here!
...
...
sdk-overrides/include/osapi.h
View file @
74d27b34
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
#include "rom.h"
#include "rom.h"
void
ets_timer_arm_new
(
ETSTimer
*
a
,
int
b
,
int
c
,
int
isMstimer
);
void
ets_timer_arm_new
(
ETSTimer
*
a
,
int
b
,
int
c
,
int
isMstimer
);
int
atoi
(
const
char
*
nptr
);
int
os_printf
(
const
char
*
format
,
...)
__attribute__
((
format
(
printf
,
1
,
2
)));
int
os_printf
(
const
char
*
format
,
...)
__attribute__
((
format
(
printf
,
1
,
2
)));
int
os_printf_plus
(
const
char
*
format
,
...)
__attribute__
((
format
(
printf
,
1
,
2
)));
int
os_printf_plus
(
const
char
*
format
,
...)
__attribute__
((
format
(
printf
,
1
,
2
)));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment