File freqtweak-0.6.1-gcc4.patch of Package freqtweak
---
src/FTprocOrderDialog.cpp | 8 ++++----
src/FTutils.hpp | 1 +
src/xml++.hpp | 5 +++++
3 files changed, 10 insertions(+), 4 deletions(-)
--- a/src/FTprocOrderDialog.cpp
+++ b/src/FTprocOrderDialog.cpp
@@ -20,7 +20,7 @@
#if HAVE_CONFIG_H
#include <config.h>
#endif
-
+#include <inttypes.h>
#include <wx/wx.h>
#include <wx/listctrl.h>
@@ -210,7 +210,7 @@
for (; mod != mlist.end(); ++mod)
{
item.SetText (wxString::FromAscii ((*mod)->getName().c_str()));
- item.SetData ((unsigned) (*mod));
+ item.SetData ((unsigned)(intptr_t) (*mod));
item.SetId(pos++);
_sourceList->InsertItem(item);
@@ -230,7 +230,7 @@
for (unsigned int n=0; n < procmods.size(); ++n)
{
item.SetText (wxString::FromAscii (procmods[n]->getName().c_str()));
- item.SetData ((unsigned) procmods[n]);
+ item.SetData ((unsigned)(intptr_t) procmods[n]);
item.SetId (n);
_targetList->InsertItem(item);
@@ -441,7 +441,7 @@
if (proc) {
item.SetText (wxString::FromAscii (proc->getName().c_str()));
- item.SetData ((unsigned)proc);
+ item.SetData ((unsigned)(intptr_t)proc);
item.SetId (_targetList->GetItemCount());
_targetList->InsertItem(item);
--- a/src/xml++.hpp
+++ b/src/xml++.hpp
@@ -9,10 +9,15 @@
#include <map>
#include <cstdio>
+/* wx and libxml have a different opinion on this one ... */
+#undef ATTRIBUTE_PRINTF
+
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <stdarg.h>
+#undef ATTRIBUTE_PRINTF
+
#ifndef __XMLPP_H
#define __XMLPP_H
--- a/src/FTutils.hpp
+++ b/src/FTutils.hpp
@@ -23,6 +23,7 @@
#include <iostream>
#include <sstream>
#include <cmath>
+#include <inttypes.h>
//#include <wx/string.h>