Merge branch 'bugfix/errno_overlap' into 'master'

newlib: fix ESHUTDOWN and ENOTSOCK having the same numerical value

See merge request espressif/esp-idf!17804
This commit is contained in:
Ivan Grokhotkov 2022-04-19 18:39:20 +08:00
commit 93edb8fd52
2 changed files with 6 additions and 15 deletions

View File

@ -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

View File

@ -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