Hopefully fixed compilation of the Shiny profiler on Linux,

where the Shiny profiler shall be disabled.

8 files changed, 24 insertions, 25 deletions

diff --git a/xs/src/Shiny/ShinyMacros.h b/xs/src/Shiny/ShinyMacros.h
index 645cbeff1..f16b5f959 100644
--- a/xs/src/Shiny/ShinyMacros.h
+++ b/xs/src/Shiny/ShinyMacros.h
@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include "ShinyManager.h"
 
-#ifdef SHINY_IS_COMPILED
+#if SHINY_IS_COMPILED == TRUE
 
 /*---------------------------------------------------------------------------*/
 /* public preprocessors */
@@ -254,7 +254,7 @@ THE SOFTWARE.
 
 /*---------------------------------------------------------------------------*/
 
-#else /* #if SHINY_IS_COMPILED == TRUE */
+#else /* if SHINY_IS_COMPILED == TRUE */
 
 #ifdef __cplusplus
 extern "C" {
@@ -292,6 +292,6 @@ SHINY_INLINE ShinyData GetEmptyData() {
 #define PROFILE_SET_ENABLED(boolean)
 #endif
 
-#endif /* SHINY_IS_COMPILED */
+#endif /* SHINY_IS_COMPILED == TRUE */
 
 #endif /* SHINY_MACROS_H */
diff --git a/xs/src/Shiny/ShinyManager.h b/xs/src/Shiny/ShinyManager.h
index 11af2c082..54119ae56 100644
--- a/xs/src/Shiny/ShinyManager.h
+++ b/xs/src/Shiny/ShinyManager.h
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 #include <stdio.h>
 
-#ifdef SHINY_IS_COMPILED
+#if SHINY_IS_COMPILED == TRUE
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xs/src/Shiny/ShinyNode.h b/xs/src/Shiny/ShinyNode.h
index abbcc9a1e..ca6d76d3b 100644
--- a/xs/src/Shiny/ShinyNode.h
+++ b/xs/src/Shiny/ShinyNode.h
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "ShinyData.h"
 #include "ShinyTools.h"
 
-#ifdef SHINY_IS_COMPILED
+#if SHINY_IS_COMPILED == TRUE
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xs/src/Shiny/ShinyNodePool.h b/xs/src/Shiny/ShinyNodePool.h
index fb6db0920..0f0f33b74 100644
--- a/xs/src/Shiny/ShinyNodePool.h
+++ b/xs/src/Shiny/ShinyNodePool.h
@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include "ShinyNode.h"
 
-#ifdef SHINY_IS_COMPILED
+#if SHINY_IS_COMPILED == TRUE
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xs/src/Shiny/ShinyOutput.h b/xs/src/Shiny/ShinyOutput.h
index 96007138e..ec72e0ece 100644
--- a/xs/src/Shiny/ShinyOutput.h
+++ b/xs/src/Shiny/ShinyOutput.h
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "ShinyNode.h"
 #include "ShinyZone.h"
 
-#ifdef SHINY_IS_COMPILED
+#if SHINY_IS_COMPILED == TRUE
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xs/src/Shiny/ShinyPrereqs.h b/xs/src/Shiny/ShinyPrereqs.h
index 9f52d0d34..500545a91 100644
--- a/xs/src/Shiny/ShinyPrereqs.h
+++ b/xs/src/Shiny/ShinyPrereqs.h
@@ -25,6 +25,20 @@ THE SOFTWARE.
 #ifndef 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 "ShinyVersion.h"
 
@@ -64,21 +78,6 @@ extern "C" {
 
 /*---------------------------------------------------------------------------*/
 
-#ifndef FALSE
-#define FALSE	0x0
-#endif
-
-#ifndef TRUE
-#define TRUE	0x1
-#endif
-
-#ifndef NULL
-#define NULL	0
-#endif
-
-
-/*---------------------------------------------------------------------------*/
-
 #if SHINY_COMPILER == SHINY_COMPILER_GNUC
 #include <sys/types.h>
 #include <stdint.h>
@@ -87,7 +86,7 @@ extern "C" {
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef SHINY_IS_COMPILED
+#if SHINY_IS_COMPILED == TRUE
 	struct _ShinyNode;
 	struct _ShinyZone;
 
diff --git a/xs/src/Shiny/ShinyTools.c b/xs/src/Shiny/ShinyTools.c
index ac6523f4c..6a7f38716 100644
--- a/xs/src/Shiny/ShinyTools.c
+++ b/xs/src/Shiny/ShinyTools.c
@@ -110,4 +110,4 @@ float ShinyGetTickInvFreq(void) {
 
 #endif
 
-#endif /* SHINY_IS_COMPILED */
+#endif /* if SHINY_IS_COMPILED == TRUE */
diff --git a/xs/src/Shiny/ShinyZone.h b/xs/src/Shiny/ShinyZone.h
index 2b6ac77b8..f6812b3c4 100644
--- a/xs/src/Shiny/ShinyZone.h
+++ b/xs/src/Shiny/ShinyZone.h
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "ShinyData.h"
 #include <memory.h>
 
-#ifdef SHINY_IS_COMPILED
+#if SHINY_IS_COMPILED == TRUE
 
 #ifdef __cplusplus
 extern "C" {