diff options
| author | bubnikv <bubnikv@gmail.com> | 2016-10-17 11:33:23 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2016-10-17 11:33:23 +0300 |
| commit | 6f4a04c2d79ecaf87708c227275065d5e36e09e6 (patch) | |
| tree | 229bb4bc64b543dfcc7234ced9473593cc90c86e | |
| parent | 52dc18e350c5379bd13150df1ff289e965204d73 (diff) | |
Fix of compilation on Linux. Disable hopefully finally the Shiny profiler.version_1.31.0
| -rw-r--r-- | xs/src/Shiny/ShinyConfig.h | 2 | ||||
| -rw-r--r-- | xs/src/Shiny/ShinyTools.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xs/src/Shiny/ShinyConfig.h b/xs/src/Shiny/ShinyConfig.h index d318574d5..fa0567100 100644 --- a/xs/src/Shiny/ShinyConfig.h +++ b/xs/src/Shiny/ShinyConfig.h @@ -32,6 +32,8 @@ THE SOFTWARE. */ #if defined(SLIC3R_PROFILE) && defined(WIN32) #define SHINY_IS_COMPILED TRUE +#else +#define SHINY_IS_COMPILED FALSE #endif #define SHINY_STATIC_LINK TRUE diff --git a/xs/src/Shiny/ShinyTools.c b/xs/src/Shiny/ShinyTools.c index 6a7f38716..e8fc320d2 100644 --- a/xs/src/Shiny/ShinyTools.c +++ b/xs/src/Shiny/ShinyTools.c @@ -100,7 +100,7 @@ void ShinyGetTicks(shinytick_t *p) { *p = time.tv_sec * 1000000 + time.tv_usec; } -const shinytick_t& ShinyGetTickFreq(void) { +shinytick_t ShinyGetTickFreq(void) { return 1000000; } |