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-jef_interproc.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-jef_interproc.cpp')
-rw-r--r-- | editors/fxite/files/patch-jef_interproc.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/editors/fxite/files/patch-jef_interproc.cpp b/editors/fxite/files/patch-jef_interproc.cpp new file mode 100644 index 000000000000..58eff0c0be65 --- /dev/null +++ b/editors/fxite/files/patch-jef_interproc.cpp @@ -0,0 +1,31 @@ +--- jef/interproc.cpp.orig 2013-10-03 09:22:51 UTC ++++ jef/interproc.cpp +@@ -323,7 +323,19 @@ static int SocketFailure(const char*func) + } + + ++#if (FOX_MINOR>6) ++# if (FOX_MAJOR>1) || (FOX_MINOR>7) || (FOX_LEVEL>49) ++# define FOX_1_7_50_OR_NEWER ++# endif ++#endif + ++#ifdef FOX_1_7_50_OR_NEWER ++# define LookupInHash(d,k) ((d)->at(k)) ++#else ++# define LookupInHash(d,k) ((d)->find(k)) ++#endif ++ ++ + long InterProc::onSocketRead(FXObject*o,FXSelector sel,void*p) + { + switch (FXSELID(sel)) { +@@ -344,7 +356,7 @@ long InterProc::onSocketRead(FXObject*o,FXSelector sel + ssize_t len=0; + char buf[bufsize]; + int read_fd=(FXival)p; +- FXString*s=(FXString*)connlist->find(p); ++ FXString*s=(FXString*)LookupInHash(connlist,p); + do { + len=read(read_fd,buf,bufsize); + if (len>0) { s->append(buf, len); } |