From 5f34882a622b260f226767e7e6ee8ff57b629209 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 4 Oct 2002 14:45:20 +0000
Subject: [PATCH] Compiles without NSIS_CONFIG_ENHANCEDUI_SUPPORT

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1299 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/build.cpp  |  2 ++
 Source/script.cpp | 13 +++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Source/build.cpp b/Source/build.cpp
index a4160068..aa5bbede 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -261,7 +261,9 @@ CEXEBuild::CEXEBuild()
   ubuild_strlist.add("",0);
   build_header.install_directory_ptr=0;
   build_header.install_reg_key_ptr=0;
+#ifdef NSIS_CONFIG_COMPONENTPAGE
   memset(build_header.install_types_ptr,0,sizeof(build_header.install_types_ptr));
+#endif
 
   // Changed by Amir Szekely 11th July 2002
   // Changed to fit the new format in which uninstaller icons are saved
diff --git a/Source/script.cpp b/Source/script.cpp
index af283abf..df0d6363 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -3428,8 +3428,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
     return PS_ERROR;
 #endif//!NSIS_CONFIG_COMPONENTPAGE
     // Added by Amir Szekely 29th July 2002
+#ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
     case TOK_SETBRANDINGIMAGE:
-#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
     {
       SCRIPT_MSG("SetBrandingImage: ");
       if (!branding_image_found) {
@@ -3460,12 +3460,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
       SCRIPT_MSG("\n");
     }
     return add_entry(&ent);
-#else
-    ERROR_MSG("Error: %s specified, NSIS_CONFIG_VISIBLE_SUPPORT not defined.\n",line.gettoken_str(0));
-    return PS_ERROR;
-#endif// NSIS_CONFIG_VISIBLE_SUPPORT
     case TOK_CREATEFONT:
-#ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
       ent.which=EW_CREATEFONT;
       ent.offsets[0]=line.gettoken_enum(1,usrvars);
       ent.offsets[1]=add_string(line.gettoken_str(2));
@@ -3516,8 +3511,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
       SCRIPT_MSG("\n");
     return add_entry(&ent);
 #else//NSIS_CONFIG_ENHANCEDUI_SUPPORT
-    ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n",line.gettoken_str(0));
-    return PS_ERROR;
+    case TOK_CREATEFONT:
+    case TOK_SETBRANDINGIMAGE:
+      ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n",line.gettoken_str(0));
+      return PS_ERROR;
 #endif//!NSIS_SUPPORT_CREATEFONT
 
     // end of instructions