diff options
| author | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
| commit | 283f676ce9c6465b3f3902147753633b4b82c223 (patch) | |
| tree | d1c70a669adaae294d1b8be18391306f8fb7c193 | |
| parent | c25c019eb8e71a9028b782c2c637e5815df4d133 (diff) | |
| download | raul-283f676ce9c6465b3f3902147753633b4b82c223.tar.gz raul-283f676ce9c6465b3f3902147753633b4b82c223.tar.bz2 raul-283f676ce9c6465b3f3902147753633b4b82c223.zip | |
Fix configuration header define names to not stomp on global namespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@2794 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/log.cpp | 10 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/log.cpp b/src/log.cpp index baabbc3..01620ee 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -20,29 +20,29 @@ namespace Raul { -#ifdef LOG_COLOUR +#ifdef RAUL_LOG_COLOUR LogBuffer info_buffer("", LogBuffer::GREEN); LogBuffer warn_buffer("", LogBuffer::YELLOW); LogBuffer error_buffer("", LogBuffer::RED); -#ifdef LOG_DEBUG +#ifdef RAUL_LOG_DEBUG LogBuffer debug_buffer("", LogBuffer::CYAN); #else NullBuffer debug_buffer; #endif -#else // !LOG_COLOUR +#else // !RAUL_LOG_COLOUR LogBuffer info_buffer("INFO: "); LogBuffer warn_buffer("WARNING: "); LogBuffer error_buffer("ERROR: "); -#ifdef LOG_DEBUG +#ifdef RAUL_LOG_DEBUG LogBuffer debug_buffer("DEBUG: "); #else NullBuffer debug_buffer; #endif -#endif // LOG_COLOUR +#endif // RAUL_LOG_COLOUR std::ostream info(&info_buffer); std::ostream warn(&warn_buffer); @@ -55,9 +55,9 @@ def configure(conf): conf.env['BUILD_TESTS'] = Options.options.build_tests if Options.options.log_colour: - autowaf.define(conf, 'LOG_COLOUR', 1) + autowaf.define(conf, 'RAUL_LOG_COLOUR', 1) if Options.options.log_debug: - autowaf.define(conf, 'LOG_DEBUG', 1) + autowaf.define(conf, 'RAUL_LOG_DEBUG', 1) conf.write_config_header('raul-config.h', remove=False) |