diff options
| author | Jordan Bayles <jophba@chromium.org> | 2020-05-06 16:59:39 -0700 |
|---|---|---|
| committer | Jordan Bayles <jophba@chromium.org> | 2020-05-07 17:26:46 +0000 |
| commit | a44d04ae66815d117c864a137db5674e6a3f3f32 (patch) | |
| tree | c6c27e3f516886fe266b2a0d6e35b97376d762bd /tools | |
| parent | 4aa11daaa6795b52c57b26376502a0c273700f2e (diff) | |
| download | openscreen-a44d04ae66815d117c864a137db5674e6a3f3f32.tar.gz | |
Rename util/logging.h to avoid collisions
Currently, the util/logging.h file causes build issues because other
external repos have the same file.
This patch fixes this bug by renaming our copy of logging.h to
osp_logging.h, the same way we renamed DCHECK to OSP_DCHECK.
Bug: b/155927492
Change-Id: I75ff546775bed01daeda2a631c06b4776e3829f1
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2186351
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cddl/codegen.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/cddl/codegen.cc b/tools/cddl/codegen.cc index 6454b5e0..ac58eed9 100644 --- a/tools/cddl/codegen.cc +++ b/tools/cddl/codegen.cc @@ -1580,7 +1580,7 @@ bool WriteSourcePrologue(int fd, const std::string& header_filename) { R"(#include "%s" #include "third_party/tinycbor/src/src/utf8_p.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace msgs { |