diff --git a/src/MerryControllerLinux.cpp b/src/MerryControllerLinux.cpp index d540e82..d1723eb 100644 --- a/src/MerryControllerLinux.cpp +++ b/src/MerryControllerLinux.cpp @@ -70,7 +70,7 @@ long MerryController::GetDesktopForWindow(Window window) const Atom request = XInternAtom(m_display, "_NET_WM_DESKTOP", False); Atom type; int size; - long nitems; + long nitems = 0; unsigned char* data = this->GetWindowPropertyByAtom(window, request, &nitems, &type, &size); long desktop = -1; @@ -113,7 +113,7 @@ void* MerryController::GetForegroundWindow() const Window root = XDefaultRootWindow(m_display); Atom type; int size; - long nitems; + long nitems = 0; unsigned char* data = this->GetWindowPropertyByAtom(root, request, &nitems, &type, &size); Window foregroundWindow = 0; diff --git a/src/MerryHelper.cpp b/src/MerryHelper.cpp index a633dfc..ed9aee7 100644 --- a/src/MerryHelper.cpp +++ b/src/MerryHelper.cpp @@ -4,7 +4,6 @@ void MerryParseCommandStr(const wxString& commandStr, wxString& commandName, wxString& commandArg) { bool inQM = false; - bool inText = false; bool inSpace = false; // http://alter.org.ua/docs/win/args/ @@ -26,7 +25,6 @@ void MerryParseCommandStr(const wxString& commandStr, wxString& commandName, wxS { case '\"': inQM = true; - inText = true; if (inSpace) goto getParam; inSpace = false; @@ -35,11 +33,9 @@ void MerryParseCommandStr(const wxString& commandStr, wxString& commandName, wxS case '\t': case '\n': case '\r': - inText = false; inSpace = true; break; default: - inText = true; if (inSpace) goto getParam; commandName += c; diff --git a/src/MerryListBoxPanel.cpp b/src/MerryListBoxPanel.cpp index 1eb7460..cb45fd0 100644 --- a/src/MerryListBoxPanel.cpp +++ b/src/MerryListBoxPanel.cpp @@ -17,6 +17,7 @@ MerryListBoxPanel::MerryListBoxPanel(wxWindow* parent): if (!wxImage::FindHandler(wxBITMAP_TYPE_PNG)) wxImage::AddHandler(new wxPNGHandler); bool isOk = m_selectionItemBackground.LoadFile(MERRY_DEFAULT_LIST_BOX_ITEM_SELECTION_BACKGROUND_FILE, wxBITMAP_TYPE_PNG); + (void)isOk; assert(isOk); for (int i=0; i -#define luai_nummod(L,a,b) ((a) - floor((a)/(b))*(b)) -#define luai_numpow(L,a,b) (pow(a,b)) +#define luai_nummod(L,a,b) ((a) - l_mathop(floor)((a)/(b))*(b)) +#define luai_numpow(L,a,b) (l_mathop(pow)(a,b)) #endif /* these are quite standard operations */ @@ -465,13 +471,12 @@ ** Some tricks with doubles */ -#if defined(LUA_CORE) && \ - defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */ +#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */ /* ** The next definitions activate some tricks to speed up the ** conversion from doubles to integer types, mainly to LUA_UNSIGNED. ** -@@ MS_ASMTRICK uses Microsoft assembler to avoid clashes with a +@@ LUA_MSASMTRICK uses Microsoft assembler to avoid clashes with a ** DirectX idiosyncrasy. ** @@ LUA_IEEE754TRICK uses a trick that should work on any machine @@ -495,7 +500,7 @@ /* Microsoft compiler on a Pentium (32 bit) ? */ #if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */ -#define MS_ASMTRICK +#define LUA_MSASMTRICK #define LUA_IEEEENDIAN 0 #define LUA_NANTRICK diff --git a/third_party/lua/linux64/include/lualib.h b/third_party/lua/linux64/include/lualib.h index 9fd126b..da82005 100644 --- a/third_party/lua/linux64/include/lualib.h +++ b/third_party/lua/linux64/include/lualib.h @@ -1,5 +1,5 @@ /* -** $Id: lualib.h,v 1.43 2011/12/08 12:11:37 roberto Exp $ +** $Id: lualib.h,v 1.43.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua standard libraries ** See Copyright Notice in lua.h */ diff --git a/third_party/lua/linux64/release/liblua.a b/third_party/lua/linux64/release/liblua.a new file mode 100644 index 0000000..d9211ce Binary files /dev/null and b/third_party/lua/linux64/release/liblua.a differ