Fix demo ifdefs

4 files changed, 7 insertions, 13 deletions

diff --git a/lang/rust/pseudorust.cpp b/lang/rust/pseudorust.cpp
index 12f58bc1..7dfe0aaf 100644
--- a/lang/rust/pseudorust.cpp
+++ b/lang/rust/pseudorust.cpp
@@ -2923,17 +2923,11 @@ extern "C"
 {
 	BN_DECLARE_CORE_ABI_VERSION
 
-#ifndef DEMO_VERSION
 	BINARYNINJAPLUGIN void CorePluginDependencies()
 	{
 	}
-#endif
 
-#ifdef DEMO_VERSION
-	bool PseudoCPluginInit()
-#else
 	BINARYNINJAPLUGIN bool CorePluginInit()
-#endif
 	{
 		LanguageRepresentationFunctionType* type = new PseudoRustFunctionType();
 		LanguageRepresentationFunctionType::Register(type);
diff --git a/plugins/warp/api/warpcore.h b/plugins/warp/api/warpcore.h
index b62f2427..633ffcbf 100644
--- a/plugins/warp/api/warpcore.h
+++ b/plugins/warp/api/warpcore.h
@@ -21,7 +21,7 @@
     #endif  // WARP_LIBRARY
 #else       // __GNUC__
     #ifdef _MSC_VER
-        #ifndef DEMO_VERSION
+        #ifndef DEMO_EDITION
             #ifdef WARP_LIBRARY
                 #define WARP_FFI_API __declspec(dllexport)
             #else  // WARP_LIBRARY
@@ -101,7 +101,7 @@ extern "C"
     };
 
     WARP_FFI_API void BNWARPRunMatcher(BNBinaryView* view);
-    
+
     WARP_FFI_API bool BNWARPGetBasicBlockGUID(BNBasicBlock* basicBlock, BNWARPBasicBlockGUID* result);
     WARP_FFI_API bool BNWARPGetAnalysisFunctionGUID(BNFunction* analysisFunction, BNWARPFunctionGUID* result);
     WARP_FFI_API bool BNWARPIsLiftedInstructionVariant(BNLowLevelILFunction* liftedFunction, size_t idx);
@@ -120,7 +120,7 @@ extern "C"
     WARP_FFI_API bool BNWARPContainerIsSourceUncommitted(BNWARPContainer* container, const BNWARPSource* source);
     WARP_FFI_API bool BNWARPContainerIsSourceWritable(BNWARPContainer* container, const BNWARPSource* source);
     WARP_FFI_API char* BNWARPContainerGetSourcePath(BNWARPContainer* container, const BNWARPSource* source);
-    
+
     WARP_FFI_API bool BNWARPContainerAddFunctions(BNWARPContainer* container, const BNWARPTarget* target, const BNWARPSource* source, BNWARPFunction** functions, size_t count);
     WARP_FFI_API bool BNWARPContainerAddTypes(BNBinaryView* view, BNWARPContainer* container, const BNWARPSource* source, BNType** types, size_t count);
 
@@ -128,7 +128,7 @@ extern "C"
     WARP_FFI_API bool BNWARPContainerRemoveTypes(BNWARPContainer* container, const BNWARPSource* source, BNWARPTypeGUID* types, size_t count);
 
     WARP_FFI_API void BNWARPContainerFetchFunctions(BNWARPContainer* container, BNWARPTarget* target, const char** sourceTags, size_t sourceTagCount, const BNWARPTypeGUID* guids, size_t count);
-    
+
     WARP_FFI_API BNWARPSource* BNWARPContainerGetSourcesWithFunctionGUID(BNWARPContainer* container, const BNWARPTarget* target, const BNWARPFunctionGUID* guid, size_t* count);
     WARP_FFI_API BNWARPSource* BNWARPContainerGetSourcesWithTypeGUID(BNWARPContainer* container, const BNWARPTypeGUID* guid, size_t* count);
     WARP_FFI_API BNWARPFunction** BNWARPContainerGetFunctionsWithGUID(BNWARPContainer* container, const BNWARPTarget* target, const BNWARPSource* source, const BNWARPFunctionGUID* guid, size_t* count);
diff --git a/view/kernelcache/api/kernelcachecore.h b/view/kernelcache/api/kernelcachecore.h
index 02451a3e..69eaec96 100644
--- a/view/kernelcache/api/kernelcachecore.h
+++ b/view/kernelcache/api/kernelcachecore.h
@@ -14,7 +14,7 @@ extern "C"
 	#endif  // KERNELCACHE_LIBRARY
 #else       // __GNUC__
 	#ifdef _MSC_VER
-		#ifndef DEMO_VERSION
+		#ifndef DEMO_EDITION
 			#ifdef KERNELCACHE_LIBRARY
 				#define KERNELCACHE_FFI_API __declspec(dllexport)
 			#else  // KERNELCACHE_LIBRARY
diff --git a/view/sharedcache/api/sharedcachecore.h b/view/sharedcache/api/sharedcachecore.h
index 00b24b60..1324fe16 100644
--- a/view/sharedcache/api/sharedcachecore.h
+++ b/view/sharedcache/api/sharedcachecore.h
@@ -8,7 +8,7 @@
 	#endif  // SHAREDCACHE_LIBRARY
 #else       // __GNUC__
 	#ifdef _MSC_VER
-		#ifndef DEMO_VERSION
+		#ifndef DEMO_EDITION
 			#ifdef SHAREDCACHE_LIBRARY
 				#define SHAREDCACHE_FFI_API __declspec(dllexport)
 			#else  // SHAREDCACHE_LIBRARY
@@ -119,7 +119,7 @@ extern "C"
 
 	SHAREDCACHE_FFI_API bool BNSharedCacheControllerIsImageLoaded(BNSharedCacheController* controller, BNSharedCacheImage* image);
 	SHAREDCACHE_FFI_API bool BNSharedCacheControllerIsRegionLoaded(BNSharedCacheController* controller, BNSharedCacheRegion* region);
-	
+
 	SHAREDCACHE_FFI_API bool BNSharedCacheControllerGetRegionAt(BNSharedCacheController* controller, uint64_t address, BNSharedCacheRegion* outRegion);
 	SHAREDCACHE_FFI_API bool BNSharedCacheControllerGetRegionContaining(BNSharedCacheController* controller, uint64_t address, BNSharedCacheRegion* region);