Skip to content

Avoid redefining macros from different files.#1104

Merged
iphydf merged 1 commit into
TokTok:masterfrom
iphydf:redefined-macros
Aug 20, 2018
Merged

Avoid redefining macros from different files.#1104
iphydf merged 1 commit into
TokTok:masterfrom
iphydf:redefined-macros

Conversation

@iphydf

@iphydf iphydf commented Aug 19, 2018

Copy link
Copy Markdown
Member

This change is Reviewable

@iphydf iphydf added this to the v0.2.x milestone Aug 19, 2018
@iphydf iphydf force-pushed the redefined-macros branch 5 times, most recently from 57637f7 to 3771981 Compare August 19, 2018 23:08
@iphydf iphydf requested a review from e0ff August 19, 2018 23:17
@codecov

codecov Bot commented Aug 19, 2018

Copy link
Copy Markdown

Codecov Report

Merging #1104 into master will decrease coverage by 0.1%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1104      +/-   ##
==========================================
- Coverage   82.56%   82.46%   -0.11%     
==========================================
  Files          80       80              
  Lines       14316    14316              
==========================================
- Hits        11820    11805      -15     
- Misses       2496     2511      +15
Impacted Files Coverage Δ
toxav/video.c 67.46% <ø> (ø) ⬆️
auto_tests/save_compatibility_test.c 87.93% <100%> (ø) ⬆️
auto_tests/set_name_test.c 93.61% <0%> (-6.39%) ⬇️
auto_tests/conference_simple_test.c 93.65% <0%> (-3.18%) ⬇️
toxav/msi.c 65.08% <0%> (-1.68%) ⬇️
toxav/toxav.c 67.85% <0%> (-1.47%) ⬇️
toxcore/onion_client.c 95.04% <0%> (-0.31%) ⬇️
toxcore/Messenger.c 86.01% <0%> (+0.16%) ⬆️
toxcore/net_crypto.c 93.6% <0%> (+0.57%) ⬆️
toxcore/LAN_discovery.c 84.9% <0%> (+0.94%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0e7cc19...7aa57af. Read the comment docs.

@e0ff e0ff left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 4 of 4 files at r1.
Reviewable status: 0 of 1 approvals obtained (waiting on @endoffile78)

@iphydf iphydf merged commit 7aa57af into TokTok:master Aug 20, 2018
@iphydf iphydf deleted the redefined-macros branch August 20, 2018 14:44
@robinlinden robinlinden modified the milestones: v0.2.x, v0.2.7 Aug 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants