Skip to content

Commit 682ea7b

Browse files
committed
Fix *nix build.
1 parent 6d32fbe commit 682ea7b

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/client/main.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
#include <primitives/pack.h>
3939
#include <primitives/templates.h>
4040
#include <primitives/executor.h>
41+
#ifdef _WIN32
4142
#include <primitives/win32helpers.h>
43+
#endif
4244
#include <primitives/sw/main.h>
4345

4446
#include <iostream>
@@ -669,7 +671,7 @@ std::optional<int> internal(const Strings &args)
669671
{
670672
#ifndef _WIN32
671673
return 0;
672-
#endif
674+
#else
673675
if (args.size() != 4)
674676
{
675677
std::cout << "invalid number of arguments: " << args.size() << "\n";
@@ -679,6 +681,7 @@ std::optional<int> internal(const Strings &args)
679681
if (!create_link(args[2], args[3], "Link to CPPAN Solution"))
680682
return 1;
681683
return 0;
684+
#endif
682685
}
683686

684687
if (args[1] == "internal-parallel-vars-check")

src/common/package_store.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
#include <primitives/hasher.h>
3535
#include <primitives/http.h>
3636
#include <primitives/templates.h>
37+
#ifdef _WIN32
3738
#include <primitives/win32helpers.h>
39+
#endif
3840

3941
#include <primitives/log.h>
4042
//DECLARE_STATIC_LOGGER(logger, "package_store");

src/printers/cmake.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
#include <primitives/command.h>
3333
#include <primitives/date_time.h>
3434
#include <primitives/executor.h>
35+
#ifdef _WIN32
3536
#include <primitives/win32helpers.h>
37+
#endif
3638

3739
#ifdef _WIN32
3840
#include <WinReg.hpp>

src/support/exceptions.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@
2121
#define REDEFINE_BOOST_USE_WINDOWS_H
2222
#endif
2323

24-
#ifdef __linux__
25-
#define BOOST_STACKTRACE_USE_BACKTRACE
26-
#endif
27-
#include <boost/stacktrace.hpp>
28-
2924
#include <boost/exception/all.hpp>
25+
#include <boost/stacktrace.hpp>
3026

3127
#ifdef REDEFINE_BOOST_USE_WINDOWS_H
3228
#define BOOST_USE_WINDOWS_H

0 commit comments

Comments
 (0)