From 71bab1078f3ce97d0040c4f67f8d0893cfd6ccf1 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 18 Apr 2022 12:07:21 +0200 Subject: [PATCH] newlib: fix ESHUTDOWN and ENOTSOCK having the same numerical value --- components/newlib/platform_include/errno.h | 20 ++++++-------------- tools/ci/check_copyright_ignore.txt | 1 - 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/components/newlib/platform_include/errno.h b/components/newlib/platform_include/errno.h index 85fb2e15b8..98dedeef88 100644 --- a/components/newlib/platform_include/errno.h +++ b/components/newlib/platform_include/errno.h @@ -1,17 +1,9 @@ -// Copyright 2018 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef _ESP_PLATFORM_ERRNO_H_ #define _ESP_PLATFORM_ERRNO_H_ @@ -21,7 +13,7 @@ // Possibly define some missing errors // #ifndef ESHUTDOWN -#define ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */ +#define ESHUTDOWN 110 /* Cannot send after transport endpoint shutdown */ #endif #ifndef EAI_SOCKTYPE diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index c6fbc2babe..bd060e72f1 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1092,7 +1092,6 @@ components/mqtt/host_test/mocks/include/sys/queue.h components/newlib/abort.c components/newlib/assert.c components/newlib/platform_include/assert.h -components/newlib/platform_include/errno.h components/newlib/platform_include/net/if.h components/newlib/platform_include/pthread.h components/newlib/platform_include/sys/dirent.h