From 60f61d1988e6e9ff69129fc09da760963a3236be Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Fri, 16 Feb 2018 08:12:16 +0000 Subject: 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' for 1st argument FXbool prepend(const FXObjectListOf& 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 --- editors/fxite/files/patch-src_menuspec.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 editors/fxite/files/patch-src_menuspec.cpp (limited to 'editors/fxite/files/patch-src_menuspec.cpp') diff --git a/editors/fxite/files/patch-src_menuspec.cpp b/editors/fxite/files/patch-src_menuspec.cpp new file mode 100644 index 000000000000..94346f03664b --- /dev/null +++ b/editors/fxite/files/patch-src_menuspec.cpp @@ -0,0 +1,12 @@ +--- src/menuspec.cpp.orig 2013-10-03 09:22:51 UTC ++++ src/menuspec.cpp +@@ -616,7 +616,8 @@ void MenuMgr::ReadPopupMenu(FXRegistry*reg, const char + memset(keyname,0, sizeof(keyname)); + snprintf(keyname,sizeof(keyname)-1,"Command_%d", i+1); + if (reg->existingEntry(popup_sect,keyname)) { +- PopupCommands[i]=strdup(reg->readStringEntry(popup_sect,keyname)); ++ const char*tmp=reg->readStringEntry(popup_sect,keyname); ++ PopupCommands[i]=strdup(tmp?tmp:""); + } + } + } else { -- cgit v1.2.3