Skip to content

Commit

Permalink
Fix Windows build
Browse files Browse the repository at this point in the history
Issue: `byte` C++ type was defined several times by different includes, and is also a standard type since C++17
Cause: ninja-build/ninja#1861
Solution: moving `#include common/darktable.h`, which includes `common/win.h` which includes `win/win.h` before `using namespace std` in C++ files.

Thanks to @OlliWa !
  • Loading branch information
aurelienpierre committed Jan 8, 2025
1 parent f6fbeea commit be2369a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/common/exif.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@

#include <pugixml.hpp>

using namespace std;

extern "C" {
#include "common/colorlabels.h"
#include "common/darktable.h"
Expand All @@ -76,6 +74,8 @@ extern "C" {
#include "develop/masks.h"
}

using namespace std;

#define DT_XMP_EXIF_VERSION 5

#if EXIV2_TEST_VERSION(0,28,0)
Expand Down

0 comments on commit be2369a

Please sign in to comment.