Merge remote-tracking branch 'upstream/master'

1 files changed, 2 insertions, 3 deletions

diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index 9e17d6a6d..6c6e32c1a 100644
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <errno.h>
 
 #include "py/nlr.h"
 #include "py/obj.h"
@@ -88,7 +87,7 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
             self->buf_pos += out_sz;
             self->to_recv -= out_sz;
             if (self->to_recv != 0) {
-                *errcode = EAGAIN;
+                *errcode = MP_EAGAIN;
                 return MP_STREAM_ERROR;
             }
         }
@@ -267,7 +266,7 @@ STATIC mp_uint_t websocket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t
             return cur;
         }
         default:
-            *errcode = EINVAL;
+            *errcode = MP_EINVAL;
             return MP_STREAM_ERROR;
     }
 }