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

[cmake] move ifdef conditions to cmake #13336

Merged
merged 4 commits into from Jan 10, 2018

Conversation

@Rechi
Copy link
Member

commented Jan 9, 2018

Description

Move condition checking to cmake if the whole *.cpp file is enclosed into one #if ....

How Has This Been Tested?

compiled for windows, osx, ios, android and linux

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed

@Rechi Rechi added this to the L 18.0-alpha1 milestone Jan 9, 2018

@@ -19,9 +19,6 @@
*
*/

#include "system.h"

#ifdef HAS_WEB_SERVER

This comment has been minimized.

Copy link
@stefansaraev

stefansaraev Jan 9, 2018

Contributor

network/WebServer.h is included unconditionaly in xbmc/settings/SettingConditions.cpp, this will break if microhttpd.h is not found.

This comment has been minimized.

Copy link
@Rechi

Rechi Jan 9, 2018

Author Member

fixed

@Rechi Rechi force-pushed the Rechi:cleanupWarnings branch from 6c78fff to de9bc98 Jan 9, 2018

@@ -18,8 +18,6 @@
*
*/

#include "system.h"

This comment has been minimized.

Copy link
@stefansaraev

stefansaraev Jan 9, 2018

Contributor

you need

#include <string.h>
#include <unistd.h>

for mempcy() and pread(). those were previously included via PlatformDefs.h

This comment has been minimized.

Copy link
@Rechi

Rechi Jan 9, 2018

Author Member

added

@Rechi Rechi force-pushed the Rechi:cleanupWarnings branch from de9bc98 to d1fed9f Jan 9, 2018

@Rechi Rechi force-pushed the Rechi:cleanupWarnings branch from d1fed9f to a9ae1f3 Jan 10, 2018

@Rechi Rechi merged commit 0df5de2 into xbmc:master Jan 10, 2018

1 check passed

default You're awesome. Have a cookie
Details

@Rechi Rechi deleted the Rechi:cleanupWarnings branch Jan 10, 2018

@notspiff notspiff referenced this pull request Jan 10, 2018
1 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.