refactoring:

- added CEXEBuild::update_exehead() and made everyone use it
 - renamed some variables (of the *exeheader* variety)
bug fix:
 - uninstaller CRC-check failed if !packhdr created a non-512-bytes-aligned exehead


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3695 212acab6-be3b-0410-9dea-997c60f758d6

Source/build.h

@@ -1,10 +1,6 @@
 #ifndef _BUILD_H_
 #define _BUILD_H_
 
-#include <stdexcept>
-
-using namespace std;
-
 #include "strlist.h"
 #include "lineparse.h"
 #include "lang.h"
@@ -117,6 +113,8 @@ class CEXEBuild {
     int prepare_uninstaller();
     int pack_exe_header();
 
+    void update_exehead(const unsigned char *new_exehead, size_t new_size);
+
     // tokens.cpp
     int get_commandtoken(char *s, int *np, int *op, int *pos);
     int IsTokenPlacedRight(int pos, char *tok);
@@ -350,8 +348,9 @@ class CEXEBuild {
 
     TinyGrowBuf verbose_stack;
 
-    unsigned char *header_data_new;
-    int exeheader_size_new;
+    unsigned char *m_exehead;
+    size_t m_exehead_size;
+
     int icon_offset;
     bool branding_image_found;
     WORD branding_image_id;