all: Don't include system errno.h when it's not needed.

micropython · Jul 24, 2017 · aa7be82 · aa7be82
1 parent a559098
commit aa7be82
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 12 deletions.
diff --git a/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c
@@ -27,7 +27,6 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 
 #include "py/mpconfig.h"

diff --git a/extmod/modbtree.c b/extmod/modbtree.c
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
+#include <errno.h> // for declaration of global errno variable
 #include <fcntl.h>
 
 #include "py/nlr.h"

diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 #include "py/nlr.h"
 #include "py/runtime.h"

diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 #include "py/nlr.h"
 #include "py/runtime.h"

diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.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"

diff --git 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;
     }
 }

diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include <errno.h>
 #include <string.h>
 #include "py/mpconfig.h"
 

diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
@@ -28,7 +28,6 @@
 #if MICROPY_VFS && MICROPY_VFS_FAT
 
 #include <stdio.h>
-#include <errno.h>
 
 #include "py/nlr.h"
 #include "py/runtime.h"

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include "py/mpstate.h"
 #include "py/compile.h"

diff --git a/py/reader.c b/py/reader.c
@@ -71,7 +71,6 @@ void mp_reader_new_mem(mp_reader_t *reader, const byte *buf, size_t len, size_t
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
 
 typedef struct _mp_reader_posix_t {
     bool close_fd;