Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sock-utils] Fix potential macro conflict #720

Merged
merged 2 commits into from
Dec 20, 2024
Merged

[sock-utils] Fix potential macro conflict #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ade9448
fix(sockutls): Fix potential macro colission including standard headers
david-cermak Dec 20, 2024
0499ed9
bump(sockutls): 0.2.0 -> 0.2.1
david-cermak Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/sock_utils/.cz.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ commitizen:
bump_message: 'bump(sockutls): $current_version -> $new_version'
pre_bump_hooks: python ../../ci/changelog.py sock_utils
tag_format: sock_utils-v$version
version: 0.2.0
version: 0.2.1
version_files:
- idf_component.yml
6 changes: 6 additions & 0 deletions components/sock_utils/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [0.2.1](https://github.com/espressif/esp-protocols/commits/sock_utils-v0.2.1)

### Bug Fixes

- Fix potential macro colission including standard headers ([ade9448c](https://github.com/espressif/esp-protocols/commit/ade9448c))

## [0.2.0](https://github.com/espressif/esp-protocols/commits/sock_utils-v0.2.0)

### Features
Expand Down
2 changes: 1 addition & 1 deletion components/sock_utils/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.2.0
version: 0.2.1
description: The component provides helper implementation of common system/socket utilities
url: https://github.com/espressif/esp-protocols/tree/master/components/sock_utils
dependencies:
Expand Down
11 changes: 11 additions & 0 deletions components/sock_utils/include/netdb_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@
*/
#pragma once

#include "sdkconfig.h"
#ifndef CONFIG_IDF_TARGET_LINUX
david-cermak marked this conversation as resolved.
Show resolved Hide resolved
#include <netinet/in.h> // For network-related definitions
#include <sys/socket.h> // For socket-related definitions
#include <net/if.h> // For interface flags (e.g., IFF_UP)
#include <netdb.h> // For NI_NUMERICHOST, NI_NUMERICSERV, etc.
#include <errno.h> // For EAI_BADFLAGS
#include <sys/un.h> // For AF_UNIX
#include <sys/types.h> // For PF_LOCAL
#endif

#ifndef NI_NUMERICHOST
#define NI_NUMERICHOST 0x1
#endif
Expand Down
Loading