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.

Sign up for GitHub

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

Jump to bottom

Fix linux build #41

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix linux build #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57623d7
Don't depend on __clang__ and include <ctime> on all non-Windows plat…
ewewukek Jan 4, 2024
801218c
Const correct variable to hold __xmlParserVersion() value
ewewukek Jan 4, 2024
e7d9679
Add missing include for libxml2
ewewukek Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/progs/dyecmd/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,9 @@ PRAGMA48(GCC diagnostic pop)
#include <sys/time.h>
#include "fs/specialfolder.h"
#undef ERROR
#endif // WIN32

#ifdef __clang__
#else // WIN32
#include <ctime>
#endif // __clang__
#endif // WIN32

#ifdef ANDROID
#ifndef USE_SDL2
Expand Down
6 changes: 2 additions & 4 deletions src/resources/wallpaper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@

#ifdef WIN32
#include <sys/time.h>
#endif // WIN32

#ifdef __clang__
#else // WIN32
#include <ctime>
#endif // __clang__
#endif // WIN32

#include "debug.h"

Expand Down
2 changes: 1 addition & 1 deletion src/unittests/utils/dumplibs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ TEST_CASE("dumplibs tests", "")
#ifdef ENABLE_LIBXML
SECTION("libxml2")
{
const char **xmlVersion = __xmlParserVersion();
const char *const *xmlVersion = __xmlParserVersion();
REQUIRE(xmlVersion != nullptr);
REQUIRE(*xmlVersion != nullptr);
REQUIRE(std::string(*xmlVersion) ==
Expand Down
2 changes: 1 addition & 1 deletion src/utils/dumplibs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void dumpLibs()
LIBXML_TEST_VERSION
#endif // LIBXML_TEST_VERSION
#ifdef ENABLE_LIBXML
const char **xmlVersion = __xmlParserVersion();
const char *const *xmlVersion = __xmlParserVersion();
if (xmlVersion != nullptr)
logger->log(" libxml2: %s", *xmlVersion);
#endif // ENABLE_LIBXML
Expand Down
4 changes: 4 additions & 0 deletions src/utils/xml/libxml.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@

#ifdef ENABLE_LIBXML

#ifdef HAVE_LIBXML2
#include <libxml/parser.h>
#endif // HAVE_LIBXML2

#include <libxml/xmlwriter.h>

__XML_XMLWRITER_H__
Expand Down