From 39e22a96dda580751350786a59077cf4acba93cf Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 10 Apr 2007 19:48:54 +0000 Subject: [PATCH] added COMPRESSOR_NONE_SELECTED instead of (NCOMPRESSOR)-1 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5043 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Makensisw/makensisw.cpp | 4 ++-- Contrib/Makensisw/makensisw.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index 09265a46..45f10de4 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -117,7 +117,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { SendDlgItemMessage(hwndDlg,IDC_LOGWIN,WM_SETFONT,(WPARAM)hFont,0); RestoreWindowPos(g_sdata.hwnd); RestoreCompressor(); - g_sdata.compressor = (NCOMPRESSOR)-1; + g_sdata.compressor = COMPRESSOR_NONE_SELECTED; argSpaceSize = SetArgv((char *)GetCommandLine(), &argc, &argv); if(argc > 1) { @@ -159,7 +159,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (argSpaceSize) GlobalFree(argv); - if(g_sdata.compressor == (NCOMPRESSOR)-1) { + if(g_sdata.compressor == COMPRESSOR_NONE_SELECTED) { SetCompressor(g_sdata.default_compressor); } if(chooseCompressor) { diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h index fa231319..7efcfb96 100644 --- a/Contrib/Makensisw/makensisw.h +++ b/Contrib/Makensisw/makensisw.h @@ -81,7 +81,8 @@ enum { }; typedef enum { - COMPRESSOR_SCRIPT, + COMPRESSOR_NONE_SELECTED = -1, + COMPRESSOR_SCRIPT = 0, COMPRESSOR_ZLIB, COMPRESSOR_ZLIB_SOLID, COMPRESSOR_BZIP2,