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

1 files changed, 11 insertions, 6 deletions

diff --git a/editors/fxite/files/patch-src__help.cpp b/editors/fxite/files/patch-src_help.cpp
index dc7bad20050f..3707f29dc9a0 100644
--- a/editors/fxite/files/patch-src__help.cpp
+++ b/editors/fxite/files/patch-src_help.cpp
@@ -1,6 +1,6 @@
 --- src/help.cpp.orig	2013-10-03 09:22:51 UTC
 +++ src/help.cpp
-@@ -36,6 +36,12 @@
+@@ -36,7 +36,13 @@
  #define sendString(iMessage, wParam, lParam) sendMessage(iMessage, wParam, reinterpret_cast<long>(lParam))
  
  
@@ -9,11 +9,12 @@
 +#else
 +# define RxFind(rx,subj,start,beg,end,npar) (rx.match(subj,beg,end,REX_FORWARD,npar,start))
 +#endif
-+
  
++
  enum {
    SCHLP_FIXED,
-@@ -224,7 +230,7 @@ void SciHelp::replace(const char*oldstr,
+   SCHLP_ITALIC,
+@@ -224,7 +230,7 @@ void SciHelp::replace(const char*oldstr, const char*ne
    FXRex generic_rx(oldstr, REX_NORMAL|REX_NEWLINE);
    content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
    FXint n=strlen(newstr);
@@ -22,7 +23,7 @@
      sendMessage(SCI_SETTARGETSTART,beg[0],0);
      sendMessage(SCI_SETTARGETEND,end[0],0);
      sendString(SCI_REPLACETARGET,n,newstr);
-@@ -261,7 +267,7 @@ void SciHelp::parse(const char*txt, unsi
+@@ -261,7 +267,7 @@ void SciHelp::parse(const char*txt, unsigned int size)
    for (FXint i=SCHLP_FIRST; i<SCHLP_LAST; i++) {
      content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
      FXRex rx(phrases[i], REX_CAPTURE|REX_NEWLINE);
@@ -31,8 +32,12 @@
        sendMessage(SCI_SETTARGETSTART,beg[0],0);
        sendMessage(SCI_SETTARGETEND,end[0],0);
        char*tmp=my_strndup(content+beg[1], end[1]-beg[1]);
-@@ -292,7 +298,7 @@ void SciHelp::parse(const char*txt, unsi
-   FXRex appname_rx("\\<"APP_NAME"\\>", REX_NORMAL|REX_NEWLINE);
+@@ -289,10 +295,10 @@ void SciHelp::parse(const char*txt, unsigned int size)
+   }
+ 
+   // Make the editor's name stand out a little...
+-  FXRex appname_rx("\\<"APP_NAME"\\>", REX_NORMAL|REX_NEWLINE);
++  FXRex appname_rx("\\<" APP_NAME "\\>", REX_NORMAL|REX_NEWLINE);
    content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
    FXint p=0;
 -  while (appname_rx.match(content,beg,end,REX_FORWARD,1, p)) {