diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-11-28 23:03:02 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-11-30 13:58:15 +0100 |
| commit | cfadb231d24bd292a6ea3708b776bde8f06e50ab (patch) | |
| tree | a0f0bc43badfad02f72bec8227a508cc3b74123d | |
| parent | e0408eee74b62a3e4a805a77314a1ac5385f8484 (diff) | |
| download | VeraCrypt-cfadb231d24bd292a6ea3708b776bde8f06e50ab.tar.gz VeraCrypt-cfadb231d24bd292a6ea3708b776bde8f06e50ab.zip | |
Linux/MacOSX: Solve compilation issue following Windows Unicode rewrite
| -rw-r--r-- | src/Common/Pkcs5.c | 1 | ||||
| -rw-r--r-- | src/Main/Forms/AboutDialog.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Common/Pkcs5.c b/src/Common/Pkcs5.c index d1bc6027..d2696d9c 100644 --- a/src/Common/Pkcs5.c +++ b/src/Common/Pkcs5.c @@ -14,6 +14,7 @@ #include "Tcdefs.h"
#include <memory.h>
+#include <stdlib.h>
#include "Rmd160.h"
#ifndef TC_WINDOWS_BOOT
#include "Sha2.h"
diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp index c7d28ba2..593a3a4f 100644 --- a/src/Main/Forms/AboutDialog.cpp +++ b/src/Main/Forms/AboutDialog.cpp @@ -28,7 +28,7 @@ namespace VeraCrypt VersionStaticText->SetFont (versionStaticTextFont); VersionStaticText->SetLabel (Application::GetName() + L" " + StringConverter::ToWide (Version::String())); - CopyrightStaticText->SetLabel (StringConverter::ToWide (TC_STR_RELEASED_BY)); + CopyrightStaticText->SetLabel (TC_STR_RELEASED_BY); WebsiteHyperlink->SetLabel (L"www.idrix.fr"); CreditsTextCtrl->SetMinSize (wxSize ( |