maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for compilation on gcc 4.2, used on Maemo 5.

This commit is contained in:
Ove Kåven 2012-08-05 16:49:00 +02:00
parent ea16d76011
commit 8277b213e5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/syncevo/LocalTransportAgent.cpp
View File

@ -856,7 +856,7 @@ public:
// for a password. However, that does not cover failures
// like the parent not asking us to sync in the first place
// and also does not work with libdbus (https://bugs.freedesktop.org/show_bug.cgi?id=49728).
m_forkexec->m_onQuit.connect(onParentQuit);
m_forkexec->m_onQuit.connect(&onParentQuit);
m_forkexec->connect();
}

4
src/syncevo/SyncContext.cpp
View File

@ -2813,7 +2813,9 @@ void SyncContext::initEngine(bool logXML)
}
}
extern "C" int (*SySync_ConsolePrintf)(FILE *stream, const char *format, ...);
extern "C" { // without curly braces, g++ 4.2 thinks the variable is extern
int (*SySync_ConsolePrintf)(FILE *stream, const char *format, ...);
}
static int nopPrintf(FILE *stream, const char *format, ...) { return 0; }