Skip to content

Commit b4cb8f8

Browse files
authored
Merge pull request #720 from david-cermak/fix/sock_utils_define_conflict
[sock-utils] Fix potential macro conflict
2 parents 4745fc8 + 0499ed9 commit b4cb8f8

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

components/sock_utils/.cz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ commitizen:
33
bump_message: 'bump(sockutls): $current_version -> $new_version'
44
pre_bump_hooks: python ../../ci/changelog.py sock_utils
55
tag_format: sock_utils-v$version
6-
version: 0.2.0
6+
version: 0.2.1
77
version_files:
88
- idf_component.yml

components/sock_utils/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## [0.2.1](https://github.com/espressif/esp-protocols/commits/sock_utils-v0.2.1)
4+
5+
### Bug Fixes
6+
7+
- Fix potential macro colission including standard headers ([ade9448c](https://github.com/espressif/esp-protocols/commit/ade9448c))
8+
39
## [0.2.0](https://github.com/espressif/esp-protocols/commits/sock_utils-v0.2.0)
410

511
### Features

components/sock_utils/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 0.2.0
1+
version: 0.2.1
22
description: The component provides helper implementation of common system/socket utilities
33
url: https://github.com/espressif/esp-protocols/tree/master/components/sock_utils
44
dependencies:

components/sock_utils/include/netdb_macros.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@
55
*/
66
#pragma once
77

8+
#include "sdkconfig.h"
9+
#ifndef CONFIG_IDF_TARGET_LINUX
10+
#include <netinet/in.h> // For network-related definitions
11+
#include <sys/socket.h> // For socket-related definitions
12+
#include <net/if.h> // For interface flags (e.g., IFF_UP)
13+
#include <netdb.h> // For NI_NUMERICHOST, NI_NUMERICSERV, etc.
14+
#include <errno.h> // For EAI_BADFLAGS
15+
#include <sys/un.h> // For AF_UNIX
16+
#include <sys/types.h> // For PF_LOCAL
17+
#endif
18+
819
#ifndef NI_NUMERICHOST
920
#define NI_NUMERICHOST 0x1
1021
#endif

0 commit comments

Comments
 (0)