Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix espconn and err_t #5392

Merged
merged 2 commits into from
Nov 29, 2018
Merged

fix espconn and err_t #5392

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af007b9
fix espconn and err_t
d-a-v Nov 29, 2018
c5373af
Merge branch 'master' into espconn
d-a-v Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion tools/sdk/include/espconn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@
extern "C" {
#endif

typedef sint8 err_t;
//typedef sint8 err_t;
// err_t has been redefined by espressif,
// use autogenerated <lwip-err-t.h> to define LWIP_ERR_T,
// this is compatible with both versions of lwIP.
#include <../../lwip2/include/lwip-err-t.h>
#include <lwip/err.h>

typedef void *espconn_handle;
typedef void (* espconn_connect_callback)(void *arg);
Expand Down