GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 19:35:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fixed compilation of the Shiny profiler on Linux,

Browse Source 
where the Shiny profiler shall be disabled.
This commit is contained in:
bubnikv 2016-10-17 09:55:42 +02:00
parent 19312d0a1a
commit 52dc18e350
8 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xs/src/Shiny/ShinyMacros.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "ShinyManager.h" #include "ShinyManager.h"
#ifdef SHINY_IS_COMPILED #if SHINY_IS_COMPILED == TRUE
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* public preprocessors */ /* public preprocessors */
@ -254,7 +254,7 @@ THE SOFTWARE.
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#else /* #if SHINY_IS_COMPILED == TRUE */ #else /* if SHINY_IS_COMPILED == TRUE */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -292,6 +292,6 @@ SHINY_INLINE ShinyData GetEmptyData() {
#define PROFILE_SET_ENABLED(boolean) #define PROFILE_SET_ENABLED(boolean)
#endif #endif
#endif /* SHINY_IS_COMPILED */ #endif /* SHINY_IS_COMPILED == TRUE */
#endif /* SHINY_MACROS_H */ #endif /* SHINY_MACROS_H */

2
xs/src/Shiny/ShinyManager.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include <stdio.h> #include <stdio.h>
#ifdef SHINY_IS_COMPILED #if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
xs/src/Shiny/ShinyNode.h
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "ShinyData.h" #include "ShinyData.h"
#include "ShinyTools.h" #include "ShinyTools.h"
#ifdef SHINY_IS_COMPILED #if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
xs/src/Shiny/ShinyNodePool.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "ShinyNode.h" #include "ShinyNode.h"
#ifdef SHINY_IS_COMPILED #if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
xs/src/Shiny/ShinyOutput.h
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "ShinyNode.h" #include "ShinyNode.h"
#include "ShinyZone.h" #include "ShinyZone.h"
#ifdef SHINY_IS_COMPILED #if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

31
xs/src/Shiny/ShinyPrereqs.h
View File

@ -25,6 +25,20 @@ THE SOFTWARE.
#ifndef SHINY_PREREQS_H #ifndef SHINY_PREREQS_H
#define SHINY_PREREQS_H #define SHINY_PREREQS_H
/*---------------------------------------------------------------------------*/
#ifndef FALSE
#define FALSE 0x0
#endif
#ifndef TRUE
#define TRUE 0x1
#endif
#ifndef NULL
#define NULL 0
#endif
#include "ShinyConfig.h" #include "ShinyConfig.h"
#include "ShinyVersion.h" #include "ShinyVersion.h"
@ -62,21 +76,6 @@ extern "C" {
#endif #endif
/*---------------------------------------------------------------------------*/
#ifndef FALSE
#define FALSE 0x0
#endif
#ifndef TRUE
#define TRUE 0x1
#endif
#ifndef NULL
#define NULL 0
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if SHINY_COMPILER == SHINY_COMPILER_GNUC #if SHINY_COMPILER == SHINY_COMPILER_GNUC
@ -87,7 +86,7 @@ extern "C" {
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef SHINY_IS_COMPILED #if SHINY_IS_COMPILED == TRUE
struct _ShinyNode; struct _ShinyNode;
struct _ShinyZone; struct _ShinyZone;

2
xs/src/Shiny/ShinyTools.c
View File

@ -110,4 +110,4 @@ float ShinyGetTickInvFreq(void) {
#endif #endif
#endif /* SHINY_IS_COMPILED */ #endif /* if SHINY_IS_COMPILED == TRUE */

2
xs/src/Shiny/ShinyZone.h
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "ShinyData.h" #include "ShinyData.h"
#include <memory.h> #include <memory.h>
#ifdef SHINY_IS_COMPILED #if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {