Skip to content

Remove semicolon at the end of #define #7355

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

Merged
merged 1 commit into from
Jun 29, 2018

Conversation

deepikabhavnani
Copy link

Description

Remove semicolon followed by pre-processor defines. Noticed build failures when building code with "EVR_RTX_DISABLE" set.

Pull request type

[X] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

Note: Fix in CMSIS repo is present.

@cmonr cmonr requested a review from bulislaw June 27, 2018 23:35
@cmonr
Copy link
Contributor

cmonr commented Jun 27, 2018

Which code was erroring/failing before this fix?

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 28, 2018

Note: Fix in CMSIS repo is present.

Worth referring to the specific SHA/pull request. I can't locate it on develop branch there. Seems still wrong to me.

This should be fixed first upstream : https://github.com/ARM-software/CMSIS_5/blame/develop/CMSIS/RTOS2/RTX/Include/rtx_evr.h#L836 ?

@JonatanAntoni

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 28, 2018

I sent upstream fix as I found these extra ; there (compare to the rest of the file, should not be there)

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 28, 2018

Upstream fixed (It was merged)

Copy link
Contributor

@0xc0170 0xc0170 left a comment

Choose a reason for hiding this comment

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

As now upstream is fixed, this will be in when we update

Copy link
Member

@bulislaw bulislaw left a comment

Choose a reason for hiding this comment

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

In the future please reference the upstream commit in the commit description.

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 28, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Jun 28, 2018

Build : SUCCESS

Build number : 2469
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7355/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Jun 28, 2018

@deepikabhavnani
Copy link
Author

In the future please reference the upstream commit in the commit description.

I left the note in description "Note: Fix in CMSIS repo is present..." Not sure why grep on my local repo didn't show me semicolons in upstream (may be old copy / wrong command). Lesson learned will always check the web GitHub repo instead local repo.

@0xc0170 - Thanks for adding PR to CMSIS.

@deepikabhavnani
Copy link
Author

Which code was erroring/failing before this fix?

EventRecorder code, when disabling RTX specific events

@cmonr
Copy link
Contributor

cmonr commented Jun 28, 2018

Pipe closed.

/morph export-build

@mbed-ci
Copy link

mbed-ci commented Jun 28, 2018

@mbed-ci
Copy link

mbed-ci commented Jun 28, 2018

@cmonr
Copy link
Contributor

cmonr commented Jun 29, 2018

/morph export-build

@mbed-ci
Copy link

mbed-ci commented Jun 29, 2018

@cmonr
Copy link
Contributor

cmonr commented Jun 29, 2018

ಠ_ಠ

/morph export-build

@mbed-ci
Copy link

mbed-ci commented Jun 29, 2018

@0xc0170 0xc0170 merged commit 2be3c13 into ARMmbed:master Jun 29, 2018
@0xc0170
Copy link
Contributor

0xc0170 commented Jun 29, 2018

I added the upstream fix to the merge commit msg

@deepikabhavnani deepikabhavnani deleted the rtx_header_fix branch June 29, 2018 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants