diff options
author | Jason E. Hale <jhale@FreeBSD.org> | 2018-02-16 08:12:16 +0000 |
---|---|---|
committer | Jason E. Hale <jhale@FreeBSD.org> | 2018-02-16 08:12:16 +0000 |
commit | 60f61d1988e6e9ff69129fc09da760963a3236be (patch) | |
tree | 5f962027f6700e5595a5dc83cc812a8bdd7ffe35 /editors/fxite/files/patch-src_luafuncs.cpp | |
parent | new port sysutils/getssl: Local LetsEncrypt client (diff) |
Fix build with clang 6 (C++11 requires a space between literal and identifier)
Mark FOX17 option broken (Not related to clang 6 in particular, the FOX-1.7
API is ever changing due to being a development version. This project
appears to be dead, so I'm not sure it is worth fixing.)
recorder.cpp:104:9: error: no matching member function for call to 'prepend'
NewMessage();
^~~~~~~~~~~~
recorder.cpp:51:6: note: expanded from macro 'NewMessage'
list.prepend((FXObject*)mm);
~~~~~^~~~~~~
/usr/local/include/fox-1.7/FXObjectList.h:256:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'MacroMessage *' for 1st argument
FXbool prepend(TYPE* object){ return FXObjectList::prepend(object); }
^
/usr/local/include/fox-1.7/FXObjectList.h:265:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'const FXObjectListOf<MacroMessage>' for 1st argument
FXbool prepend(const FXObjectListOf<TYPE>& objects){ return FXObjectList::prepend(objects); }
^
/usr/local/include/fox-1.7/FXObjectList.h:259:10: note: candidate function not viable: requires 2 arguments, but 1 was provided
FXbool prepend(TYPE* object,FXival n){ return FXObjectList::prepend(object,n); }
^
/usr/local/include/fox-1.7/FXObjectList.h:262:10: note: candidate function not viable: requires 2 arguments, but 1 was provided
FXbool prepend(TYPE** objects,FXival n){ return FXObjectList::prepend(objects,n); }
^
Rename/remake patches
Diffstat (limited to 'editors/fxite/files/patch-src_luafuncs.cpp')
-rw-r--r-- | editors/fxite/files/patch-src_luafuncs.cpp | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/editors/fxite/files/patch-src_luafuncs.cpp b/editors/fxite/files/patch-src_luafuncs.cpp new file mode 100644 index 000000000000..a09ac0b50623 --- /dev/null +++ b/editors/fxite/files/patch-src_luafuncs.cpp @@ -0,0 +1,58 @@ +--- src/luafuncs.cpp.orig 2013-10-03 09:22:51 UTC ++++ src/luafuncs.cpp +@@ -25,8 +25,8 @@ + #include <FX88591Codec.h> + #include <FXUTF16Codec.h> + +-#include "macro.h" + #include "compat.h" ++#include "macro.h" + #include "appwin_pub.h" + #include "scidoc.h" + #include "doctabs.h" +@@ -38,6 +38,9 @@ + #include "intl.h" + #include "luafuncs.h" + ++#if LUA_VERSION_NUM<502 ++# define lua_rawlen lua_objlen ++#endif + + + /* +@@ -86,7 +89,7 @@ static bool check_find_flags(lua_State* L, int pos, in + { + flags=0; + luaL_argcheck(L, lua_istable(L,pos), pos, _("expected table")); +- int n=lua_objlen(L, pos); ++ int n=lua_rawlen(L, pos); + for (int i=1; i<=n; i++) { + lua_rawgeti(L, pos, i); + if (lua_isstring(L,-1)) { +@@ -287,7 +290,7 @@ static int select(lua_State* L) + sel_start=luaL_checkinteger(L,1); + sel_end=(1==argc)?sel_start:luaL_checkinteger(L,2); + sci->sendMessage(SCI_SETSELECTIONMODE, rectsel?SC_SEL_RECTANGLE:SC_SEL_STREAM, 0); +- sci->sendMessage(SCI_SETCURRENTPOS, sel_end, FALSE); ++ sci->sendMessage(SCI_SETCURRENTPOS, sel_end, false); + sci->sendMessage(SCI_SETANCHOR, sel_start, 0); + sci->ScrollCaret(); + sci->sendMessage(SCI_SETSELECTIONMODE, rectsel?SC_SEL_RECTANGLE:SC_SEL_STREAM, 0); +@@ -1354,7 +1357,7 @@ static int tagfiles(lua_State* L) + + + +-static const struct luaL_reg fxte_funcs[] = { ++static const struct luaL_Reg fxte_funcs[] = { + {"seltext", seltext}, + {"text", text}, + {"documents", documents}, +@@ -1403,7 +1406,7 @@ static const struct luaL_reg fxte_funcs[] = { + + + +-const luaL_reg* LuaFuncs() ++const luaL_Reg* LuaFuncs() + { + return fxte_funcs; + } |