Skip to content

Commit

Permalink
aja_common.hpp: compilation fixes
Browse files Browse the repository at this point in the history
AJA is built as a standalone library and the some of the actual
dependencies are overriden in aja_common.hpp header.
  • Loading branch information
MartinPulec committed Jul 26, 2024
1 parent 9634c5a commit 9303b10
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/aja_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
#pragma GCC diagnostic ignored "-Wcast-qual"
#include <ntv2card.h> // for CNTV2Card

#include "aja_common.hpp"
#include "utils/color_out.h" // for color_printf, TUNDERLINE
#include "aja_common.hpp" // include after color_out to override its stuff for MSVC

#ifndef BYTE_SWAP
#ifdef WORDS_BIGENDIAN
Expand Down
5 changes: 5 additions & 0 deletions src/aja_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@ class CNTV2Card;
#define log_msg(x, ...) fprintf(stderr, __VA_ARGS__)
#define color_printf printf
#undef LOG
#include <iostream>
#define LOG(level) if (level > log_level) ; else std::cerr
#define col() std::cout
#undef TUNDERLINE
#define TUNDERLINE(x) x
#undef SUNDERLINE
#define SUNDERLINE(x) x
#endif

// compat
Expand Down

0 comments on commit 9303b10

Please sign in to comment.