Skip to content

Conversation

mysterywolf
Copy link
Member

@mysterywolf mysterywolf commented Dec 5, 2021

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

[
BYTE_ORDER 的定义应该放在cc.h中
1638684548(1)

在GCC和Keil下 1.4.1 2.0.2 2.0.3 2.1.2冲突已经解决

]

以下的内容不应该在提交PR时的message修改,修改下述message,PR会被直接关闭。请在提交PR后,浏览器查看PR并对以下检查项逐项check,没问题后逐条在页面上打钩。
The following content must not be changed in the submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use a web browser to visit PR, and check items one by one, and ticked them if no problem.

当前拉取/合并请求的状态 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

@mysterywolf
Copy link
Member Author

mysterywolf commented Dec 5, 2021

此外发现了一个在Keil下2.1.2的一个隐藏问题,将由下一个PR来解决,本PR只负责解决BYTE_ORDER冲突问题
@xiangxistu 贤良,这个PR合并之后,请用Keil编译一下2.1.2版本的LWIP,会有一个报错,应该是当时在实现的时候没有对该函数进行对外声明,导致找不到函数。该问题只在2.1.2版本存在。请再提一个PR修复这个问题😁。

@xiangxistu
Copy link
Member

此外发现了一个在Keil下2.1.2的一个隐藏问题,将由下一个PR来解决,本PR只负责解决BYTE_ORDER冲突问题 @xiangxistu 贤良,这个PR合并之后,请用Keil编译一下2.1.2版本的LWIP,会有一个报错,应该是当时在实现的时候没有对该函数进行对外声明,导致找不到函数。该问题只在2.1.2版本存在。请再提一个PR修复这个问题😁。

OK,我看一下

@BernardXiong BernardXiong merged commit 3dd1aa7 into RT-Thread:master Dec 5, 2021
@mysterywolf mysterywolf deleted the lwip branch December 5, 2021 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants