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.

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

修复 #8293 问题 #8307

Merged
merged 1 commit into from
Nov 29, 2023
Merged

修复 #8293 问题 #8307

merged 1 commit into from
Nov 29, 2023

Conversation

rcitach
Copy link
Contributor

@rcitach rcitach commented Nov 28, 2023

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

修复 #8293

你的解决方案是什么 (what is your solution)

请提供验证的bsp和config (provide the config and bsp)

  • BSP:
  • .config:
  • action:

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

@zhkag
Copy link
Member

zhkag commented Nov 28, 2023

这三个 ci 报错应该都是这个 pr 合并出的问题 #8293 ,麻烦您尽快修复
image

update toolchains

update

update

update

update

update

update

update
@BernardXiong BernardXiong added +1 Agree +1 wait_+2 wait for "+2" to confirm labels Nov 29, 2023
@BernardXiong
Copy link
Member

@geniusgogo please double check.

@@ -186,11 +186,11 @@ struct sockaddr
/* Structure describing the address of an AF_LOCAL (aka AF_UNIX) socket. */
struct sockaddr_un
{
unsigned short sa_family;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里在libc中应该是sa_family_t sa_family;

Copy link
Contributor Author

@rcitach rcitach Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#8293 之前的版本中,这个数据结构由三个变量组成。兼容性问题会单独再提交一份pr

@geniusgogo geniusgogo added +2 Agree +2 and removed wait_+2 wait for "+2" to confirm labels Nov 29, 2023
@BernardXiong BernardXiong merged commit 1e6b2a8 into RT-Thread:master Nov 29, 2023
38 checks passed
geniusgogo pushed a commit that referenced this pull request Dec 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
+1 Agree +1 +2 Agree +2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants