r15420 - /desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Fri Mar 28 19:16:50 2008
New Revision: 15420

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15420
Log:
Expand patch with a few more fixes needed for 4.7.0.

Modified:
    desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch

Modified: desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch?rev=15420&op=diff
==============================================================================
--- desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch (original)
+++ desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch Fri Mar 28 19:16:50 2008
@@ -244,3 +244,41 @@
  typedef struct _ModuleSettingsData ModuleSettingsData;
  
  struct _ModuleSettingsData {
+diff --git a/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp b/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
+index ec427e2..c57dd97 100644
+--- a/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
++++ b/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
+@@ -26,6 +26,8 @@
+ #include "CTWLanguageModel.h"
+ #include <math.h> // not in use anymore? needed it for log
+ 
++#include <cstring>
++
+ using namespace Dasher;
+ 
+ // Track memory leaks on Windows to the line that new'd the memory
+diff --git a/Src/DasherCore/SettingsStore.cpp b/Src/DasherCore/SettingsStore.cpp
+index 8720e36..0c930a2 100644
+--- a/Src/DasherCore/SettingsStore.cpp
++++ b/Src/DasherCore/SettingsStore.cpp
+@@ -13,6 +13,8 @@
+ #include "EventHandler.h"
+ 
+ #include <iostream>
++#include <cstdlib>
++#include <climits>
+ 
+ using namespace std;
+ 
+diff --git a/Src/Gtk2/dasher_editor_internal.cpp b/Src/Gtk2/dasher_editor_internal.cpp
+index d64cb2a..f01e21f 100644
+--- a/Src/Gtk2/dasher_editor_internal.cpp
++++ b/Src/Gtk2/dasher_editor_internal.cpp
+@@ -7,6 +7,7 @@
+ #include <libgnomevfs/gnome-vfs.h> 
+ //#endif
+ 
++#include <cstring>
+ 
+ #ifdef WITH_MAEMO
+ #include "dasher_action_keyboard_maemo.h"